twat 0.9.2 → 0.9.3

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-gemfile: Gemfile.travis
 rvm:
   # - 1.8.7
   - 1.9.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twat (0.9.1)
+    twat (0.9.2)
       oauth
       readline-ng (>= 0.0.8)
       twitter
@@ -18,23 +18,23 @@ GEM
     i18n (0.6.0)
     metaclass (0.0.1)
     mktemp (0.0.1)
-    mocha (0.11.3)
+    mocha (0.11.4)
       metaclass (~> 0.0.1)
-    multi_json (1.3.2)
+    multi_json (1.3.5)
     multipart-post (1.1.5)
     oauth (0.4.6)
     rake (0.9.2.2)
-    readline-ng (0.0.8)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    readline-ng (0.0.9)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simple_oauth (0.1.7)
-    twitter (2.2.4)
+    rspec-mocks (2.10.1)
+    simple_oauth (0.1.8)
+    twitter (2.4.0)
       activesupport (>= 2.3.9, < 4)
       faraday (~> 0.8)
       multi_json (~> 1.3)

data/lib/twat/follow_mixin.rb

@@ -68,9 +68,10 @@ module FollowMixin
 
   def process_input(inp)
     case inp
-    when /^[rR][tT] ([0-9]{1,2})/
+    when /^(?:retweet|rt) ([0-9]{1,2})/i
       begin
-        retweet($1.to_i)
+        twt = get_tweet($1.to_i)
+        Twitter.retweet(twt.id)
         return true
       rescue ::Twat::Exceptions::NoSuchTweet
         return "#{inp.red} #{":: No such tweet".bold.red}"
@@ -105,11 +106,6 @@ module FollowMixin
     @tweetstack[idx]
   end
 
-  # Wrapper methods from the tweetstack implementation
-  def retweet(idx)
-    Twitter.retweet(get_tweet(idx).id)
-  end
-
   def fail_or_bail
     if @failcount > 2
       puts "3 consecutive failures, giving up"

data/lib/twat/version.rb

@@ -1,7 +1,7 @@
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 9
-  VERSION_PATCH = 2
+  VERSION_PATCH = 3
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
 end

data/spec/follow_mixin_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe FollowMixin do
+
+  it "Should not retweet users with numbers for usernames" do
+    # 58 seems to be a magic number
+    subcmd = Twat::Subcommands::FollowTag.new([])
+    def subcmd.tweetstack
+      @tweetstack ||= ::Twat::TweetStack.new
+    end
+
+    # We start tweetstack offsets at 1 for easy readability
+    (1..60).each { |n| subcmd.tweetstack << Twat::Mocks::Tweet.new(:id => n) }
+
+    Twitter.expects(:retweet).with(10058)
+    subcmd.send(:process_input, "rt 58")
+  end
+
+end

data/spec/helpers/{oauth.rb → mocks/oauth.rb}

@@ -1,14 +1,14 @@
 STUB_URL = "url"
 STUB_PIN = "1234"
 def mock_request_token
-  t = mock()
+  t = ::Mocha::Mock.new(Object)
   t.expects(:authorize_url).returns(STUB_URL)
   t.expects(:get_access_token).with(oauth_verifier: STUB_PIN).returns(mock_access_token)
   return t
 end
 
 def mock_access_token
-  t = mock()
+  t = ::Mocha::Mock.new(Object)
   t.expects(:token).returns("I'mtotallyatokenbrah")
   t.expects(:secret).returns("I'mtotallyasecretbrah")
   return t

data/spec/helpers/mocks/tweet.rb

@@ -0,0 +1,19 @@
+module Twat::Mocks
+  class Tweet
+    def initialize(opts={})
+      @opts = opts
+    end
+
+    def id
+      @opts[:id]+10000
+    end
+
+    # def method_missing(sym, *args)
+    #   if opts.include? sym
+    #     opts[sym]
+    #   else
+    #     raise "#{sym}"
+    #   end
+    # end
+  end
+end

data/spec/spec_helper.rb

@@ -9,5 +9,5 @@ Dir["#{File.expand_path(File.dirname(__FILE__))}/helpers/**/*.rb"].each do |f|
 end
 
 RSpec.configure do |config|
-  config.mock_with :mocha
+  config.mock_framework = :mocha
 end

data/spec/subcommands/finger_spec.rb

@@ -13,7 +13,7 @@ describe Twat do
 
   it "Should retrieve a tweet for user if called with only a user" do #{{{
     with_config(Fixtures::multiuser_config) do
-      tweet = mock()
+      tweet = Twat::Mocks::Tweet.new
       tweet.expects(:each).yields(tweet)
       Twitter.expects(:user_timeline).with("hanke", :count => 1).returns(tweet)
       Twat::Subcommands::Finger.any_instance.expects(:format).with(tweet)
@@ -27,7 +27,7 @@ describe Twat do
 
   it "Should retrieve n tweets for user if invoked with count" do #{{{
     with_config(Fixtures::multiuser_config) do
-      tweet = mock()
+      tweet = Twat::Mocks::Tweet.new
       Twitter.expects(:user_timeline).with("hanke", :count => 3).returns([tweet, tweet, tweet])
       Twat::Subcommands::Finger.any_instance.expects(:format).with(tweet).times(3)
 

data/spec/subcommands/follow_tag_spec.rb

@@ -26,7 +26,7 @@ describe Twat do
 
   it "Should call search with the argument if called with one" do #{{{
     with_config(Fixtures::multiuser_config) do
-      mock_opts = mock()
+      mock_opts = Mocha::Mock.new(Object)
       Twitter.expects(:search).with("#hackmelb", count: 5)
       Twat::Subcommands::FollowTag.any_instance.expects(:untested).returns(false).at_least_once
       set_argv ["follow_tag", "#hackmelb"]
@@ -38,7 +38,7 @@ describe Twat do
 
   it "Should cat together all commandline args" do #{{{
     with_config(Fixtures::multiuser_config) do
-      mock_opts = mock()
+      mock_opts = Mocha::Mock.new(Object)
       Twitter.expects(:search).with("#hackmelb richo", count: 5)
       Twat::Subcommands::FollowTag.any_instance.expects(:untested).returns(false).at_least_once
       set_argv ["follow_tag", "#hackmelb", "richo"]

data/twat.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "twat"
+require "twat/version"
 
 Gem::Specification.new do |s|
   s.name        = "twat"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -136,7 +136,6 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
-- Gemfile.travis
 - README
 - Rakefile
 - TODO
@@ -172,11 +171,13 @@ files:
 - lib/twat/version.rb
 - man/twat.1
 - spec/argparse_spec.rb
+- spec/follow_mixin_spec.rb
 - spec/helpers/environment.rb
 - spec/helpers/fileutils.rb
 - spec/helpers/fixtures/core.rb
 - spec/helpers/fixtures/migrations.rb
-- spec/helpers/oauth.rb
+- spec/helpers/mocks/oauth.rb
+- spec/helpers/mocks/tweet.rb
 - spec/spec_helper.rb
 - spec/subcommands/add_spec.rb
 - spec/subcommands/config_spec.rb
@@ -220,3 +221,4 @@ signing_key:
 specification_version: 3
 summary: Command line tool for tweeting and whatnot
 test_files: []
+has_rdoc: 

data/Gemfile.travis

@@ -1,12 +0,0 @@
-source :rubygems
-
-gem "twitter"
-gem "oauth"
-gem "readline-ng", ">= 0.0.4"
-group :test do
-  gem "rake"
-  gem "mocha"
-  gem "rspec"
-  gem "mktemp"
-end
-