usaidwat 0.1.1 → 0.1.2

data/features/help.feature

@@ -8,7 +8,7 @@ Feature: Get help
     When I run `usaidwat --help`
     Then it should pass with:
       """
-      Usage: usaidwat [--tally] <user> [<subreddit>]
+      Usage: usaidwat [-t] <user> [<subreddit>]
       """
   
   Scenario: Get version

data/lib/usaidwat/application.rb

@@ -15,7 +15,7 @@ module USaidWat
     end
     
     def usage(code=0)
-      puts "Usage: usaidwat [--tally] <user> [<subreddit>]"
+      puts "Usage: usaidwat [-t] <user> [<subreddit>]"
       exit code
     end
     
@@ -66,7 +66,7 @@ module USaidWat
         usage if argv.first == "--help"
         version if argv.first == "--version"
         opts = {:tally => false}
-        if argv.first == "--tally"
+        if argv.first == "-t"
           opts[:tally] = true
           argv.shift
           usage(1) unless argv.length == 1

data/lib/usaidwat/formatter.rb

@@ -1,4 +1,7 @@
 require 'stringio'
+require 'rainbow'
+
+Sickill::Rainbow.enabled = true unless ENV['USAIDWAT_ENV'] == 'cucumber'
 
 module USaidWat
   module CLI
@@ -9,9 +12,9 @@ module USaidWat
       
       def format(comment)
         out = StringIO.new
-        out.write("#{hr}\n") unless @count == 0
-        out.write("#{comment.subreddit}\n")
-        out.write("#{comment_link(comment)}\n")
+        out.write("\n\n") unless @count == 0
+        out.write("#{comment.subreddit}\n".color(:green))
+        out.write("#{comment_link(comment)}\n".color(:yellow))
         out.write("\n")
         out.write("#{comment.body}\n")
         @count += 1
@@ -20,10 +23,6 @@ module USaidWat
       end
       
       private
-        def hr
-          "-" * 80
-        end
-        
         def comment_link(comment)
           link = comment.link_id.split("_")[-1]
           "http://www.reddit.com/r/#{comment.subreddit}/comments/#{link}/z/#{comment.id}"

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/spec_helper.rb

@@ -1,2 +1,9 @@
 require 'usaidwat'
 require 'webmock/rspec'
+
+
+class String
+  def delete_ansi_color_codes
+    delete("\u{1b}").gsub(/\[[0-9]+m/, '')
+  end
+end

data/spec/usaidwat/formatter_spec.rb

@@ -18,12 +18,11 @@ http://www.reddit.com/r/programming/comments/13f783/z/c73qhxi
 
 Welcome to the wonderful world of Python drama!
 EXPECTED
-          actual = formatter.format(comment)
+          actual = formatter.format(comment).delete_ansi_color_codes
           actual.should == expected
         end
         
-        it "should print a horizontal rule for subsequent comments" do
-          expected = "-" * 80
+        it "should print two spaces between comments" do
           comment1 = double("first comment")
           comment1.should_receive(:subreddit).twice.and_return("programming")
           comment1.should_receive(:link_id).and_return("t3_13f783")
@@ -36,8 +35,10 @@ EXPECTED
           comment2.should_receive(:body).and_return("Welcome to the wonderful world of Python drama!")
           s = formatter.format(comment1)
           s = formatter.format(comment2)
-          actual = s.split("\n")[0]
-          actual.should == expected
+          lines = s.split("\n")
+          lines[0].should == ''
+          lines[1].should == ''
+          lines[2].should_not == ""
         end
       end
     end

data/usaidwat.gemspec

@@ -17,11 +17,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('snooby')
+  gem.add_dependency('snooby', '~> 0.1.5')
+  gem.add_dependency('rainbow', '~> 1.1.4')
 
-  gem.add_development_dependency('rspec')
-  gem.add_development_dependency('cucumber')
-  gem.add_development_dependency('aruba')
-  gem.add_development_dependency('webmock')
-  gem.add_development_dependency('sinatra')
+  gem.add_development_dependency('rspec', '~> 2.12.0')
+  gem.add_development_dependency('cucumber', '~> 1.2.1')
+  gem.add_development_dependency('aruba', '~> 0.5.1')
+  gem.add_development_dependency('webmock', '~> 1.9.0')
+  gem.add_development_dependency('sinatra', '~> 1.3.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,104 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snooby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 description: View a user's last 100 Reddit comments, organized by subreddit.
 email:
 - michael@monkey-robot.com
@@ -118,7 +134,7 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
-- README.md
+- README.textile
 - Rakefile
 - bin/usaidwat
 - features/browse.feature

data/README.md

@@ -1,29 +0,0 @@
-# Usaidwat
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'usaidwat'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install usaidwat
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request