retrobot 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36483df2d5483d39cb99a144af509657a19bee92
-  data.tar.gz: acc2cf7d3ed70ad460fd189d6b12aff67f3ad7fa
+  metadata.gz: a07ffd05e9636227ff02974c5fec321e325e8074
+  data.tar.gz: 283059383b9df7552d2f0707300b9ae86ca66090
 SHA512:
-  metadata.gz: 032fe2499a535e62b0af01b792bf2e7c9a48fc72475dc98f603095b4dc87b519c3e3cdaa38d4a83ee8bb93bdfa8343700ce11213619faa8b26dcd8cae9056b3c
-  data.tar.gz: 5c855645ebe133640bd96fa87e8624995676ced98ee16d1a24ca37fd4d8f0d3c893f7a7aec56bb55a091ffef272867928800aa3aa29a2f6fdd1fced8fb3913d6
+  metadata.gz: ce0c93e370528b6d1af9c209e576b09eebc74d0584c909106b38b54956cdf24feaccc3c73b4d4c4e9904ba37643731b656b45f938d01c4c96a08a1b8b32ceeb1
+  data.tar.gz: e12385d0b8efc843ecc2a4ed5261218bfd562d6ad99c07ad394b11e0dddaf96039f8e4e88c3dd1ec974f518409845cf8dc16c94c2fff6dabd53a2ef0a9f5df65

data/.gitignore

@@ -5,3 +5,4 @@ tmp/
 pkg/
 .bundle
 retrobot.yml
+Gemfile.lock

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.1
+  - 2.1.4
+  - 2.2.0
 script: 'bundle exec rspec spec'

data/ChangeLog.md

@@ -1,4 +1,8 @@
 # ChangeLog
+## 0.3.3
+- Add dying_message feature and `dying_mention_to` option (Thanks @sonots)
+- Bug fix: error with retryable-2.0.0 (Thanks @hansode)
+
 ## 0.3.2
 - Add `remove_hashtag` option (Thanks @kenjiskywalker)
   - https://github.com/mirakui/retrobot/pull/10

data/lib/retrobot.rb

@@ -61,20 +61,43 @@ class Retrobot
         break;
       end
     end
-    csv.slice! last_index..-1
-    logger.info "Next update: \"#{csv.last[5]}\" at #{@config.retro_days.since(Time.parse(csv.last[3]))}"
+    csv.slice! last_index..-1 if last_index
+    if csv.empty?
+      logger.fatal "No data is left. Please update the tweets.csv"
+      false
+    else
+      logger.info "Next update: \"#{csv.last[5]}\" at #{@config.retro_days.since(Time.parse(csv.last[3]))}"
+      true
+    end
   end
 
   def tweet_loop
     logger.info 'start'
     loop do
       line = csv.last
+      unless line
+        dying_message
+        return false
+      end
       if process_line(line)
         csv.pop
       end
       sleep @config.loop_interval
       logger.debug '.'
     end
+    true
+  end
+
+  def dying_message
+    message = "No data is left. Please update my tweets.csv. Pee.. Gaa..."
+    tweet_text = if mention = @config.dying_mention_to
+                   "#{mention} #{message}"
+                 else
+                   message
+                 end
+    twitter = TweetFilters::Tweet.new(self)
+    twitter.tweet(tweet_text)
+    logger.fatal message
   end
 
   def process_line(line)
@@ -139,8 +162,8 @@ class Retrobot
 
   def main
     init_configuration
-    init_csv
-    tweet_loop
+    exit 1 unless init_csv
+    exit 1 unless tweet_loop
   end
 
   private

data/lib/retrobot/config.rb

@@ -20,6 +20,7 @@ class Retrobot
       add_in_reply_to_url
       suppress_pattern
       remove_hashtag
+      dying_mention_to
     )
 
     DEFAULTS = {
@@ -34,6 +35,7 @@ class Retrobot
       add_in_reply_to_url: false,
       suppress_pattern: nil,
       remove_hashtag: false,
+      dying_mention_to: nil,
     }
 
     def initialize(options={})
@@ -60,6 +62,13 @@ class Retrobot
     def retry_interval; @options[:retry_interval].to_i; end
     def retry_count;    @options[:retry_count].to_i; end
 
+    def dying_mention_to
+      return nil unless @options[:dying_mention_to]
+      # add mention mark (atmark)
+      @options[:dying_mention_to].start_with?('@') ?
+        @options[:dying_mention_to] : "@" + @options[:dying_mention_to]
+    end
+
     def load_yaml_file!(path)
       @options.merge! Psych.load_file(path.to_s).symbolize_keys
     end

data/lib/retrobot/tweet_filters/retweet.rb

@@ -25,7 +25,7 @@ class Retrobot
       def retweet(status_id, text=nil)
         logger.info "retweet: #{status_id} \"#{text}\""
         return if config.dryrun
-        retryable(tries: config.retry_count, sleep: config.retry_interval) do
+        Retryable.retryable(tries: config.retry_count, sleep: config.retry_interval) do
           client.retweet status_id
         end
       end

data/lib/retrobot/tweet_filters/tweet.rb

@@ -12,11 +12,10 @@ class Retrobot
         tweet tweet.text
       end
 
-      private
       def tweet(text)
         logger.info "tweet: #{text}"
         return if config.dryrun
-        retryable(tries: config.retry_count, sleep: config.retry_interval) do
+        Retryable.retryable(tries: config.retry_count, sleep: config.retry_interval) do
           client.update text
         end
       end

data/lib/retrobot/version.rb

@@ -1,3 +1,3 @@
 class Retrobot
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/retrobot.example.yml

@@ -10,3 +10,4 @@ access_secret: your_access_secret
 # add_in_reply_to_url: false (default=false / add url of in_reply_to into the tweet)
 # remove_hashtag: false (default=false / remove hashtag the tweet)
 # suppress_pattern: '@\w+' (default=nil / regular expression for tweet text which you don't need to tweet)
+# dying_mention_to: '@mirakui' (default=nil / send dying message as mention to this person if tweets.csv doesn't have tweets anymore)

data/spec/lib/retrobot_spec.rb

@@ -88,5 +88,20 @@ describe Retrobot do
         end
       end
     end
+
+    context "no data left" do
+      before do
+        allow(retrobot).to receive(:csv).and_return([]) # empty
+      end
+
+      it 'shoud exit if no data left on starting up' do
+        expect(retrobot.init_csv).to be false
+      end
+
+      it 'should tweet a dying message and exit if no data left on tweet_loop' do
+        expect(client).to receive(:update)
+        expect(retrobot.tweet_loop).to be false
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.raise_errors_for_deprecations!
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retrobot
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -123,7 +123,6 @@ files:
 - ".travis.yml"
 - ChangeLog.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -169,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Retrobot tweets a word that you''ve tweeted just 1 year ago. (example: @mirakui_retro)'

data/Gemfile.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: .
-  specs:
-    retrobot (0.3.1)
-      activesupport (~> 4.0)
-      daemons
-      get-twitter-oauth-token
-      retryable
-      twitter (~> 5.8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    buftok (0.2.0)
-    daemons (1.1.9)
-    diff-lcs (1.2.5)
-    equalizer (0.0.9)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    get-twitter-oauth-token (1.1.0)
-      oauth
-    http (0.6.1)
-      http_parser.rb (~> 0.6.0)
-    http_parser.rb (0.6.0)
-    i18n (0.6.9)
-    json (1.8.1)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    minitest (5.3.4)
-    multipart-post (2.0.0)
-    naught (1.0.0)
-    oauth (0.4.7)
-    retryable (1.3.5)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.0)
-    rspec-expectations (2.99.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
-    simple_oauth (0.2.0)
-    thread_safe (0.3.4)
-    timecop (0.7.1)
-    twitter (5.10.0)
-      addressable (~> 2.3)
-      buftok (~> 0.2.0)
-      equalizer (~> 0.0.9)
-      faraday (~> 0.9.0)
-      http (~> 0.6.0)
-      http_parser.rb (~> 0.6.0)
-      json (~> 1.8)
-      memoizable (~> 0.4.0)
-      naught (~> 1.0)
-      simple_oauth (~> 0.2.0)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  retrobot!
-  rspec (= 2.99)
-  timecop