From 438a27f025313e6c4d617d5e65ed35cddee37fdf Mon Sep 17 00:00:00 2001 From: Rebecca Turner <637275@gmail.com> Date: Sat, 31 Dec 2016 02:22:19 -0500 Subject: [PATCH 1/3] Moved to v6.0 of the twitter gem, updated .gemspec * Added a link to this repo in `gem.homepage` * Changed the copyright year from 2013 to 2016 in `LICENSE` * Added pessimistic operators for all other runtime dependencies with versions > 1.0 * Added `*.model binary` to `.gitattributes` to prevent CRLF conversion in the model files * Fixed a few CRLF inconstencies (to LF-only, as specified in `.gitattributes`) * Incremented version number to 3.1.7 When I say "Moved to v6.0 of the `twitter` gem", I really mean "changed the dependency from 5.15 to 6.0". I tested changes with a few different bots and it didn't seem to break anything. --- .gitattributes | 2 ++ Gemfile | 8 +++---- LICENSE | 44 +++++++++++++++++------------------ Rakefile | 4 ++-- lib/twitter_ebooks/version.rb | 2 +- skeleton/bots.rb | 1 + twitter_ebooks.gemspec | 17 +++++++------- 7 files changed, 41 insertions(+), 37 deletions(-) diff --git a/.gitattributes b/.gitattributes index e895a20..ae7190e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,4 @@ # Require \n style line endings * text eol=lf +# Make sure the spurious \r\n doesn't get stripped in these +*.model binary diff --git a/Gemfile b/Gemfile index 0daef45..6ccb1b0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in twitter_ebooks.gemspec -gemspec +source 'https://rubygems.org' + +# Specify your gem's dependencies in twitter_ebooks.gemspec +gemspec diff --git a/LICENSE b/LICENSE index 136cb1e..525ca69 100644 --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,22 @@ -Copyright (c) 2013 Jaiden Mispy - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +Copyright (c) 2016 Jaiden Mispy + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Rakefile b/Rakefile index e4f19e6..f57ae68 100644 --- a/Rakefile +++ b/Rakefile @@ -1,2 +1,2 @@ -#!/usr/bin/env rake -require "bundler/gem_tasks" +#!/usr/bin/env rake +require "bundler/gem_tasks" diff --git a/lib/twitter_ebooks/version.rb b/lib/twitter_ebooks/version.rb index b4a936d..89e6c20 100644 --- a/lib/twitter_ebooks/version.rb +++ b/lib/twitter_ebooks/version.rb @@ -1,3 +1,3 @@ module Ebooks - VERSION = "3.1.6" + VERSION = "3.1.7" end diff --git a/skeleton/bots.rb b/skeleton/bots.rb index 12cdfa7..47938cd 100644 --- a/skeleton/bots.rb +++ b/skeleton/bots.rb @@ -29,6 +29,7 @@ def on_startup def on_message(dm) # Reply to a DM + # Make sure to set your API permissions to "Read, Write and Access direct messages" or this won't work! # reply(dm, "secret secrets") end diff --git a/twitter_ebooks.gemspec b/twitter_ebooks.gemspec index 3f3508c..48313e0 100644 --- a/twitter_ebooks.gemspec +++ b/twitter_ebooks.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |gem| gem.email = ["^_^@mispy.me"] gem.description = %q{Markov chains for all your friends~} gem.summary = %q{Markov chains for all your friends~} - gem.homepage = "" + gem.homepage = "https://github.com/mispy/twitter_ebooks" gem.files = `git ls-files`.split($\) gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) } @@ -16,6 +16,7 @@ Gem::Specification.new do |gem| gem.name = "twitter_ebooks" gem.require_paths = ["lib"] gem.version = Ebooks::VERSION + gem.licenses = ["MIT"] gem.add_development_dependency 'rspec' gem.add_development_dependency 'rspec-mocks' @@ -24,14 +25,14 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'pry-byebug' gem.add_development_dependency 'yard' - gem.add_runtime_dependency 'twitter', '~> 5.15' - gem.add_runtime_dependency 'rufus-scheduler' - gem.add_runtime_dependency 'gingerice' - gem.add_runtime_dependency 'htmlentities' + gem.add_runtime_dependency 'twitter', '~> 6.0' + gem.add_runtime_dependency 'rufus-scheduler', '~> 3.3' + gem.add_runtime_dependency 'gingerice', '~> 1.2' + gem.add_runtime_dependency 'htmlentities', '~> 4.3' gem.add_runtime_dependency 'engtagger' - gem.add_runtime_dependency 'fast-stemmer' - gem.add_runtime_dependency 'highscore' + gem.add_runtime_dependency 'fast-stemmer', '~> 1.0' + gem.add_runtime_dependency 'highscore', '~> 1.2' gem.add_runtime_dependency 'pry' gem.add_runtime_dependency 'oauth' - gem.add_runtime_dependency 'mini_magick' + gem.add_runtime_dependency 'mini_magick', '~> 4.6' end From 6170e13a41c3c123c83ac4b850936d031ddf9e19 Mon Sep 17 00:00:00 2001 From: Rebecca Turner <637275@gmail.com> Date: Sat, 15 Jul 2017 16:48:09 -0400 Subject: [PATCH 2/3] Bumped version to 3.1.8, updated gemspec for newer versions (notably of rufus to fix a weird timezone bug) --- .gitignore | 1 + lib/twitter_ebooks/version.rb | 2 +- twitter_ebooks.gemspec | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index f2b5f47..28e8674 100755 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ Gemfile.lock pkg .yardoc doc +twitter_ebooks-*.gem diff --git a/lib/twitter_ebooks/version.rb b/lib/twitter_ebooks/version.rb index 89e6c20..d63eb62 100644 --- a/lib/twitter_ebooks/version.rb +++ b/lib/twitter_ebooks/version.rb @@ -1,3 +1,3 @@ module Ebooks - VERSION = "3.1.7" + VERSION = "3.1.8" end diff --git a/twitter_ebooks.gemspec b/twitter_ebooks.gemspec index 48313e0..d986de8 100644 --- a/twitter_ebooks.gemspec +++ b/twitter_ebooks.gemspec @@ -18,21 +18,21 @@ Gem::Specification.new do |gem| gem.version = Ebooks::VERSION gem.licenses = ["MIT"] - gem.add_development_dependency 'rspec' - gem.add_development_dependency 'rspec-mocks' - gem.add_development_dependency 'memory_profiler' - gem.add_development_dependency 'timecop' - gem.add_development_dependency 'pry-byebug' - gem.add_development_dependency 'yard' + gem.add_development_dependency 'rspec', '~> 3.6' + gem.add_development_dependency 'rspec-mocks', '~> 3.6' + gem.add_development_dependency 'memory_profiler', '~> 0.9' + gem.add_development_dependency 'timecop', '~> 0.9' + gem.add_development_dependency 'pry-byebug', '~> 3.4' + gem.add_development_dependency 'yard', '~> 0.9' gem.add_runtime_dependency 'twitter', '~> 6.0' - gem.add_runtime_dependency 'rufus-scheduler', '~> 3.3' + gem.add_runtime_dependency 'rufus-scheduler', '~> 3.4' gem.add_runtime_dependency 'gingerice', '~> 1.2' gem.add_runtime_dependency 'htmlentities', '~> 4.3' - gem.add_runtime_dependency 'engtagger' + gem.add_runtime_dependency 'engtagger', '~> 0' gem.add_runtime_dependency 'fast-stemmer', '~> 1.0' gem.add_runtime_dependency 'highscore', '~> 1.2' - gem.add_runtime_dependency 'pry' - gem.add_runtime_dependency 'oauth' + gem.add_runtime_dependency 'pry', '~> 0' + gem.add_runtime_dependency 'oauth', '~> 0.5' gem.add_runtime_dependency 'mini_magick', '~> 4.6' end From 2dc1228afdff8329113b69a755bd926f3fd8d6c7 Mon Sep 17 00:00:00 2001 From: Rebecca Turner <637275@gmail.com> Date: Sat, 15 Jul 2017 16:48:43 -0400 Subject: [PATCH 3/3] updated gemspec, twitter to 6.1, mini magick to 4.8 --- twitter_ebooks.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/twitter_ebooks.gemspec b/twitter_ebooks.gemspec index d986de8..01ef3e6 100644 --- a/twitter_ebooks.gemspec +++ b/twitter_ebooks.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'pry-byebug', '~> 3.4' gem.add_development_dependency 'yard', '~> 0.9' - gem.add_runtime_dependency 'twitter', '~> 6.0' + gem.add_runtime_dependency 'twitter', '~> 6.1' gem.add_runtime_dependency 'rufus-scheduler', '~> 3.4' gem.add_runtime_dependency 'gingerice', '~> 1.2' gem.add_runtime_dependency 'htmlentities', '~> 4.3' @@ -34,5 +34,5 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'highscore', '~> 1.2' gem.add_runtime_dependency 'pry', '~> 0' gem.add_runtime_dependency 'oauth', '~> 0.5' - gem.add_runtime_dependency 'mini_magick', '~> 4.6' + gem.add_runtime_dependency 'mini_magick', '~> 4.8' end