tweetwine 0.2.9 → 0.2.10

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 0.2.10 released 2010-02-28
+
+* Fixed a bug in retrying connection upon connection failure: the last attempt
+  to connect, after 64 seconds, was missing
+* Small implementation improvements
+
 === 0.2.9 released 2010-02-24
 
 * HTTP proxy support

data/example/show_metadata_example.rb

@@ -13,7 +13,7 @@ Feature "show metadata" do
     end
 
     Then "version is shown" do
-      @output.should =~ /\d\.\d\.\d$/
+      @output.should =~ /\d+\.\d+\.\d+$/
       @status.exitstatus.should == CLI::EXIT_VERSION
     end
   end

data/lib/tweetwine/cli.rb

@@ -37,7 +37,7 @@ module Tweetwine
       @global_option_parser = create_global_option_parser(exec_name)
       @config = StartupConfig.new(Client::COMMANDS + [:help], Client::DEFAULT_COMMAND, extra_opts)
       @config.parse(args, config_file, [:http_proxy], &@global_option_parser)
-      @client = Client.new(dependencies_blk.call(@config.options), @config.options) if @config.command != :help
+      @client = Client.new(yield(@config.options), @config.options) if @config.command != :help
     end
 
     def show_help_command_and_exit(args)

data/lib/tweetwine/client.rb

@@ -25,10 +25,17 @@ module Tweetwine
       @page_num = Util.parse_int_gt(options[:page_num], DEFAULT_PAGE_NUM, 1, "page number")
       @url_shortener = if options[:shorten_urls] && options[:shorten_urls][:enable]
         dependencies.url_shortener.call(options[:shorten_urls])
-      else
-        nil
       end
-      @status_update_factory = StatusUpdateFactory.new(@io, @url_shortener)
+    end
+
+    def followers(args = [], options = nil)
+      response = get_from_rest_api("statuses/followers/#{@username}")
+      show_users_from_rest_api(*response)
+    end
+
+    def friends(args = [], options = nil)
+      response = get_from_rest_api("statuses/friends/#{@username}")
+      show_users_from_rest_api(*response)
     end
 
     def home(args = [], options = nil)
@@ -41,15 +48,15 @@ module Tweetwine
       show_statuses_from_rest_api(*response)
     end
 
-    def user(args = [], options = nil)
-      user = if args.empty? then @username else args.first end
-      response = get_from_rest_api("statuses/user_timeline/#{user}", :num_statuses, :page)
-      show_statuses_from_rest_api(*response)
+    def search(args = [], options = nil)
+      raise ArgumentError, "No search word" if args.empty?
+      query = if options && options[:bin_op] == :or then args.join(" OR ") else args.join(" ") end
+      response = get_from_search_api(query, :num_statuses, :page)
+      show_statuses_from_search_api(*response["results"])
     end
 
     def update(args = [], options = nil)
-      new_status = if args.empty? then nil else args.join(" ") end
-      new_status = @status_update_factory.create(new_status)
+      new_status = create_status_update(args.join(" "))
       completed = false
       unless new_status.empty?
         @io.show_status_preview(new_status)
@@ -63,21 +70,10 @@ module Tweetwine
       @io.info "Cancelled." unless completed
     end
 
-    def friends(args = [], options = nil)
-      response = get_from_rest_api("statuses/friends/#{@username}")
-      show_users_from_rest_api(*response)
-    end
-
-    def followers(args = [], options = nil)
-      response = get_from_rest_api("statuses/followers/#{@username}")
-      show_users_from_rest_api(*response)
-    end
-
-    def search(args = [], options = nil)
-      raise ArgumentError, "No search word" if args.empty?
-      query = if options && options[:bin_op] == :or then args.join(" OR ") else args.join(" ") end
-      response = get_from_search_api(query, :num_statuses, :page)
-      show_statuses_from_search_api(*response["results"])
+    def user(args = [], options = nil)
+      user = if args.empty? then @username else args.first end
+      response = get_from_rest_api("statuses/user_timeline/#{user}", :num_statuses, :page)
+      show_statuses_from_rest_api(*response)
     end
 
     private
@@ -158,57 +154,32 @@ module Tweetwine
       end
     end
 
-    class StatusUpdateFactory
-      def initialize(io, url_shortener)
-        @io = io
-        @url_shortener = url_shortener
-      end
-
-      def create(status)
-        StatusUpdate.new(status, @io, @url_shortener).to_s
+    def create_status_update(status)
+      status = if status.nil? || status.empty?
+        @io.prompt("Status update")
+      else
+        status.dup
       end
+      status.strip!
+      shorten_urls_in(status) if @url_shortener
+      truncate_status(status) if status.length > MAX_STATUS_LENGTH
+      status
     end
 
-    class StatusUpdate
-      def initialize(status, io, url_shortener)
-        @io = io
-        @url_shortener = url_shortener
-        @text = prepare(status)
-      end
-
-      def to_s
-        @text.to_s
+    def shorten_urls_in(status)
+      url_pairs = URI.extract(status, ["http", "https"]).uniq.map do |url_to_be_shortened|
+        [url_to_be_shortened, @url_shortener.shorten(url_to_be_shortened)]
       end
-
-      private
-
-      def prepare(status)
-        status = unless status
-          @io.prompt("Status update")
-        else
-          status.dup
-        end
-        status.strip!
-        shorten_urls!(status) if @url_shortener
-        truncate!(status) if status.length > MAX_STATUS_LENGTH
-        status
-      end
-
-      def truncate!(status)
-        status.replace status[0...MAX_STATUS_LENGTH]
-        @io.warn("Status will be truncated.")
+      url_pairs.reject { |pair| pair.last.nil? || pair.last.empty? }.each do |url_pair|
+        status.gsub!(url_pair.first, url_pair.last)
       end
+    rescue HttpError, LoadError => e
+      @io.warn "#{e}. Skipping URL shortening..."
+    end
 
-      def shorten_urls!(status)
-        url_pairs = URI.extract(status, ["http", "https"]).uniq.map do |url_to_be_shortened|
-          [url_to_be_shortened, @url_shortener.shorten(url_to_be_shortened)]
-        end
-        url_pairs.reject { |pair| pair.last.nil? || pair.last.empty? }.each do |url_pair|
-          status.gsub!(url_pair.first, url_pair.last)
-        end
-      rescue HttpError, LoadError => e
-        @io.warn "#{e}. Skipping URL shortening..."
-      end
+    def truncate_status(status)
+      status.replace status[0...MAX_STATUS_LENGTH]
+      @io.warn("Status will be truncated.")
     end
   end
 end

data/lib/tweetwine/io.rb

@@ -46,7 +46,7 @@ module Tweetwine
     end
 
     def show_record(record)
-      clean_record!(record)
+      clean_record(record)
       if record[:status]
         show_record_as_user_with_status(record)
       else
@@ -56,10 +56,10 @@ module Tweetwine
 
     private
 
-    def clean_record!(record)
+    def clean_record(record)
       record.each_pair do |key, value|
         if value.is_a? Hash
-          clean_record!(value)
+          clean_record(value)
         else
           unless value.nil?
             value = value.to_s

data/lib/tweetwine/meta.rb

@@ -1,3 +1,3 @@
 module Tweetwine
-  VERSION = "0.2.9".freeze
+  VERSION = "0.2.10".freeze
 end

data/lib/tweetwine/retrying_http.rb

@@ -27,13 +27,13 @@ module Tweetwine
       private
 
       def do_with_retries
-        tries = 0
+        retries = 0
         begin
-          tries += 1
           yield
         rescue Errno::ECONNRESET, RestClient::RequestTimeout => e
-          if tries < MAX_RETRIES
-            timeout = RETRY_BASE_WAIT_TIMEOUT**tries
+          if retries < MAX_RETRIES
+            retries += 1
+            timeout = RETRY_BASE_WAIT_TIMEOUT**retries
             @io.warn("Could not connect -- retrying in #{timeout} seconds") if @io
             sleep timeout
             retry

data/lib/tweetwine/startup_config.rb

@@ -29,7 +29,7 @@ module Tweetwine
     end
 
     def parse_cmdline_args(args, &cmd_option_parser)
-      cmd_option_parser.call(args)
+      yield args
     end
 
     def parse_config_file(config_file)

data/lib/tweetwine/util.rb

@@ -71,7 +71,7 @@ module Tweetwine
 
     def self.find_hash_path(hash, path)
       return nil if hash.nil?
-      path = [path] if !path.is_a? Array
+      path = [path] unless path.is_a? Array
       path.inject(hash) do |result, key|
         return hash.default if key.nil? || result.nil?
         result[key]

data/test/client_test.rb

@@ -220,6 +220,7 @@ class ClientTest < Test::Unit::TestCase
 
         should "cancel a status update via argument, when empty status" do
           @http_resource.expects(:[]).never
+          @io.expects(:prompt).with("Status update").returns("")
           @io.expects(:confirm).never
           @io.expects(:info).with("Cancelled.")
           @io.expects(:show_record).never

data/test/retrying_http_test.rb

@@ -68,10 +68,10 @@ class ClientTest < Test::Unit::TestCase
       should "retry connection a maximum of certain number of times, case #{error_class}" do
         retrying_calls = sequence("Retrying Client calls")
         io_calls = sequence("IO")
-        Client::MAX_RETRIES.times do
+        (Client::MAX_RETRIES + 1).times do
           RestClient.expects(:get).with("https://unresponsive.org").in_sequence(retrying_calls).raises(error_class)
         end
-        (Client::MAX_RETRIES - 1).times do
+        Client::MAX_RETRIES.times do
           @io.expects(:warn).in_sequence(io_calls)
         end
         assert_raise(HttpError) { @client.get("https://unresponsive.org") }
@@ -131,10 +131,10 @@ class ResourceTest < Test::Unit::TestCase
       should "retry connection a maximum of certain number of times, case #{error_class}" do
         retrying_calls = sequence("Retrying Resource calls")
         io_calls = sequence("IO")
-        Resource::MAX_RETRIES.times do
+        (Resource::MAX_RETRIES + 1).times do
           @wrapped.expects(:get).in_sequence(retrying_calls).raises(error_class)
         end
-        (Resource::MAX_RETRIES - 1).times do
+        Resource::MAX_RETRIES.times do
           @io.expects(:warn).in_sequence(io_calls)
         end
         assert_raise(HttpError) { @resource.get }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 +02:00
+date: 2010-02-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- tweetwine 0.2.9
+- tweetwine 0.2.10
 - --main
 - README.rdoc
 - --exclude