winnie 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    winnie (0.0.5)
+    winnie (0.0.6)
       json
       rest-client
 
 GEM
   remote: http://rubygems.org/
   specs:
+    ZenTest (4.5.0)
     diff-lcs (1.1.2)
     fakefs (0.2.1)
-    json (1.4.6)
+    json (1.5.1)
     mime-types (1.16)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  ZenTest
   fakefs
-  json
-  rest-client
-  rspec (~> 2.1.0)
+  rspec (~> 2.2.0)
   winnie!

data/lib/winnie.rb

@@ -1,11 +1,12 @@
-# TODO: loop here, and load all commands
 require 'rubygems'
 require 'rest_client'
 require 'json'
 require 'optparse'
-require 'winnie/version'
-require 'winnie/helpers'
-require 'winnie/client'
-require 'winnie/commands/base'
-require 'winnie/command'
-Dir["#{File.dirname(__FILE__)}/winnie/commands/*"].each { |c| require c }
+
+lib_path = File.expand_path(File.dirname(__FILE__))
+
+%w(version helpers client command commands/base).each do |file|
+  require File.join(lib_path, "winnie", file)
+end
+
+Dir["#{lib_path}/winnie/commands/*"].each { |c| require c }

data/lib/winnie/client.rb

@@ -40,10 +40,6 @@ module Winnie
       ) { |response, request| process_response(response) }
     end
 
-    class UnauthorizedException < Exception; end
-    class ResourceNotFoundException < Exception; end
-    class CommandFailedException < Exception; end
-
     def self.version
       VERSION
     end
@@ -51,6 +47,7 @@ module Winnie
     private
 
     def self.winnie_headers
+      # User-Agent header is used by winnie-app to check compatibility
       {'User-Agent'     => "winnie-gem-#{version}",
        'X-Ruby-Version' => RUBY_VERSION}
     end
@@ -58,7 +55,6 @@ module Winnie
     def process_response(response)
       # TODO: this fragment could look better
       if [404, 500, 401].include?(response.code)
-
         exception = case response.code
           when 404; ResourceNotFoundException
           when 500; CommandFailedException
@@ -69,13 +65,18 @@ module Winnie
         raise exception.new(error)
       end
 
-      response.return!
-
-      if response.code == 302 and response.args[:url] =~ /user_session/
-        raise UnauthorizedException.new
+      begin
+        response.return!
+        JSON.parse(response.body)
+      rescue RestClient::RequestFailed => e
+        raise UnauthorizedException.new if e.http_code == 406
+        raise UnsupportedException.new
       end
-
-      JSON.parse(response.body)
     end
+
+    class UnauthorizedException < Exception; end
+    class ResourceNotFoundException < Exception; end
+    class CommandFailedException < Exception; end
+    class UnsupportedException < Exception; end
   end
 end

data/lib/winnie/commands/app.rb

@@ -4,12 +4,13 @@ module Winnie
       def run
         list
       end
-      
+
       def command
-        response = winnie.command(args.first, code_name)
+        command = File.exists?(args.first) ? File.read(args.first) : args.first
+        response = winnie.command(command, code_name)
         display response['result']
       end
-      
+
       def list
         apps = winnie.apps
 

data/lib/winnie/commands/base.rb

@@ -2,34 +2,34 @@ module Winnie
   module Commands
     class Base
       attr_reader :winnie, :args
-      
+
       include Winnie::Helpers
-      
+
       def initialize(*args)
         @args = args.flatten
         extract_options(@args)
       end
-      
+
       def extract_options(args)
         return if args.empty?
-        
+
         OptionParser.new do |opts|
           opts.on("-a", "--app [CODE_NAME]", :text, "Run for given application") do |a|
             @code_name = a
           end
         end.parse!(@args)
       end
-      
+
       def code_name
         raise ApplicationNotSpecyfiedException.new unless @code_name
         @code_name
       end
-      
+
       def winnie
         auth = Winnie::Commands::Auth.new
         @winnie ||= Winnie::Client.new(auth.api_key)
       end
-      
+
       def config_path
         File.expand_path('~/.winnie')
       end

data/lib/winnie/commands/help.rb

@@ -3,7 +3,7 @@ module Winnie
     class Help < Base
       def run
         display_columns 'auth', 'Configure your winnie username and password'
-        display_columns 'command', 'Run single ruby command'
+        display_columns 'command <command or file>', 'Run ruby command, a file with commands can be given'
         display_columns 'list', 'List your applications'
         display_columns 'help', 'Show this information'
       end

data/lib/winnie/helpers.rb

@@ -4,25 +4,25 @@ module Winnie
       STDOUT << message
       STDOUT << "\n" if new_line
     end
-    
+
     def display_columns(*columns)
-      columns.each { |field| display(field.to_s.ljust(20), false) }
+      columns.each { |field| display(field.to_s.ljust(30), false) }
       display ''
     end
-    
+
     def line
       display '-' * 45
     end
-    
+
     def error(message)
       STDERR << message << "\n"
       exit 1
     end
-        
+
     def ask
       gets.strip
     end
-    
+
     def confirm(message)
       loop do
         STDERR << message << " (Y/N): "

data/lib/winnie/version.rb

@@ -1,3 +1,3 @@
 module Winnie
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/client_spec.rb

@@ -60,38 +60,59 @@ describe Winnie::Client do
       @client.get('/api/account')
     end
 
-    it "should raise UnauthorizedException when response has 401 code" do
-      @response.stub(:code).and_return(401)
-      lambda {
-        @client.get('/api/account')
-      }.should raise_error(Winnie::Client::UnauthorizedException)
+    context "on 401 response code" do
+      it "should raise UnauthorizedException" do
+        @response.stub(:code).and_return(401)
+        lambda {
+          @client.get('/api/account')
+        }.should raise_error(Winnie::Client::UnauthorizedException)
+      end
     end
 
-    it "should raise UnauthorizedException when it gets redirected to login page" do
-      @response.stub(:args).and_return({:url => 'user_session'})
-      @response.stub(:code).and_return(302)
+    context "on 406 response code" do
+      it "should raise UnauthorizedException" do
+        exception = RestClient::RequestFailed.new
+        exception.stub(:http_code).and_return(406)
+        @response.should_receive(:return!).and_raise(exception)
 
-      lambda {
-        @client.get('/api/account')
-      }.should raise_error(Winnie::Client::UnauthorizedException)
+        lambda {
+          @client.get('/api/account')
+        }.should raise_error(Winnie::Client::UnauthorizedException)
+      end
     end
 
-    it "should raise ResourceNotFoundException when response has 404 code" do
-      @response.stub(:code).and_return(404)
-      @response.stub(:body).and_return({'error' => 'App not found'}.to_json)
+    context "on 404 response code" do
+      it "should raise ResourceNotFoundException" do
+        @response.stub(:code).and_return(404)
+        @response.stub(:body).and_return({'error' => 'App not found'}.to_json)
 
-      lambda {
-        @client.post('/api/apps/flower/command', :body => 'puts User.count')
-      }.should raise_error(Winnie::Client::ResourceNotFoundException, 'App not found')
+        lambda {
+          @client.post('/api/apps/flower/command', :body => 'puts User.count')
+        }.should raise_error(Winnie::Client::ResourceNotFoundException, 'App not found')
+      end
     end
 
-    it "should raise CommandFailedException when response has 500 code" do
-      @response.stub(:code).and_return(500)
-      @response.stub(:body).and_return({'error' => 'random error happened'}.to_json)
+    context "on 500 response code" do
+      it "should raise CommandFailedException" do
+        @response.stub(:code).and_return(500)
+        @response.stub(:body).and_return({'error' => 'random error happened'}.to_json)
 
-      lambda {
-        @client.post('/api/apps/flower/command', :body => 'puts User.count')
-      }.should raise_error(Winnie::Client::CommandFailedException, 'random error happened')
+        lambda {
+          @client.post('/api/apps/flower/command', :body => 'puts User.count')
+        }.should raise_error(Winnie::Client::CommandFailedException, 'random error happened')
+      end
+    end
+
+    context "on unsupported response code" do
+      it "should raise UnknownResponse exception" do
+        exception = RestClient::RequestFailed.new
+        exception.stub(:http_code).and_return(409)
+        @response.should_receive(:return!).and_raise(exception)
+
+        lambda {
+          @client.get('/api/account')
+        }.should raise_error(Winnie::Client::UnsupportedException)
+      end
     end
   end
 

data/spec/command_spec.rb

@@ -7,7 +7,7 @@ describe Winnie::Command do
       @command.stub!(:respond_to?).and_return(true)
       Winnie::Commands::Help.stub!(:new).and_return(@command)
     end
-    
+
     it "should create command class object" do
       Winnie::Command.should_receive(:eval).with('Winnie::Commands::Help').and_return(Winnie::Commands::Help)
       Winnie::Command.run('help')
@@ -20,7 +20,7 @@ describe Winnie::Command do
           Winnie::Command.run('help:connection')
         end
       end
-      
+
       describe "and command name is not provided" do
         it "should invoke run method" do
           @command.should_receive(:run).and_return(true)
@@ -28,34 +28,34 @@ describe Winnie::Command do
         end
       end
     end
-    
+
     describe "when command class doesn't exist" do
       before do
         @app = mock('Winnie::Commands::App', :list => [])
         Winnie::Commands::App.stub(:new).and_return(@app)
       end
-      
+
       it "should use App command class as default" do
         Winnie::Commands::App.should_receive(:new).and_return(@app)
         Winnie::Command.run('list')
       end
-      
+
       it "should use command class name as command name" do
         @app.should_receive(:list)
         Winnie::Command.run('list')
-      end      
+      end
     end
-    
+
     it "should notify user when resource doesn't exist" do
       app = mock(Winnie::Commands::App)
       app.should_receive(:command).and_raise(Winnie::Client::ResourceNotFoundException.new('App not found'))
       Winnie::Commands::App.stub(:new).and_return(app)
-      
+
       Winnie::Command.should_receive(:error).with('App not found')
-      
+
       Winnie::Command.run('command', ["'puts User.count'", '--app', 'flower'])
     end
-    
+
     it "should notify user when command doesn't exist" do
       Winnie::Command.should_receive(:error).with('Unknown command')
       Winnie::Command.run('unknown')

data/spec/commands/app_spec.rb

@@ -2,13 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Winnie::Commands::App do
   before do
-    @app = Winnie::Commands::App.new('--app', 'flower')
+    @client = mock(Winnie::Client)
+    @app = Winnie::Commands::App.new('--app', 'flower', 'Product.cleanup_cache!')
+    @app.stub(:winnie).and_return(@client)
     @app.stub(:display_columns)
+    @app.stub(:display)
     @app.stub(:line)
-    @client = mock(Winnie::Client.new('secret-api-key'))
-    @app.stub(:winnie).and_return(@client)
   end
-  
+
   describe "when user has some apps" do
     it "should list apps" do
       @client.should_receive(:apps).and_return(apps)
@@ -17,9 +18,9 @@ describe Winnie::Commands::App do
       @app.list
     end
   end
-  
+
   describe "when user doesn't have any app" do
-    it "should inform the user that he doesn't have any app" do
+    it "should inform the user that he doesn't have any apps" do
       @client.should_receive(:apps).and_return([])
       @app.should_receive(:display).with("You don't have any apps yet")
       @app.list
@@ -27,23 +28,34 @@ describe Winnie::Commands::App do
   end
 
   describe "running commands" do
-    before do
-      @app = Winnie::Commands::App.new('--app', 'shop-16', "Product.cleanup_cache!")
-      @app.stub(:display_columns)
-      @app.stub(:display)
-      @app.stub(:line)
-      @app.stub(:winnie).and_return(@client)
-    end
-    
-    it "should send command to winnie given as a command line parameter" do
-      @client.should_receive(:command).with('Product.cleanup_cache!', 'shop-16').and_return({})
-      @app.command
+    context "command given by command line parameter" do
+      it "should send command to winnie given as a command line parameter" do
+        @client.should_receive(:command).with('Product.cleanup_cache!', 'flower').and_return({})
+        @app.command
+      end
+
+      it "should display the result" do
+        @client.should_receive(:command).with('Product.cleanup_cache!', 'flower').and_return('result' => 'foo')
+        @app.should_receive(:display).with('foo')
+        @app.command
+      end
     end
-    
-    it "should display the result" do
-      @client.should_receive(:command).with('Product.cleanup_cache!', 'shop-16').and_return('result' => 'foo')
-      @app.should_receive(:display).with('foo')
-      @app.command      
+
+    context "command given by a file" do
+      include FakeFS::SpecHelpers
+      before do
+        File.open('test-command.rb', 'w') { |f| f << '10 + 10' }
+        @app = Winnie::Commands::App.new('--app', 'flower', 'test-command.rb')
+        @app.stub(:winnie).and_return(@client)
+        @app.stub(:display_columns)
+        @app.stub(:display)
+        @app.stub(:line)
+      end
+
+      it "should read the file and execute the command" do
+        @client.should_receive(:command).with('10 + 10', 'flower').and_return({})
+        @app.command
+      end
     end
   end
 end

data/spec/commands/base_spec.rb

@@ -6,7 +6,7 @@ describe Winnie::Commands::Base do
       Winnie::Commands::Base.new.config_path.should == File.expand_path('~/.winnie')
     end
   end
-  
+
   describe "extract_options" do
     it "should extract app code name if provided" do
       base = Winnie::Commands::Base.new('--app', 'crazy-one')

data/winnie.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
   s.add_dependency "rest-client"
-  s.add_development_dependency "rspec", "~> 2.1.0"
+  s.add_development_dependency "rspec", "~> 2.2.0"
   s.add_development_dependency "fakefs"
+  s.add_development_dependency "ZenTest"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: winnie
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - winnie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,12 +54,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 2
-        - 1
+        - 2
         - 0
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Command line tool which allows interacting with winnie's API
 email: 
 - winnie-devs@ragnarson.com
@@ -140,9 +154,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: winnie
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Winnie command line tool
-test_files: []
-
+test_files: 
+- spec/client_spec.rb
+- spec/command_spec.rb
+- spec/commands/app_spec.rb
+- spec/commands/auth_spec.rb
+- spec/commands/base_spec.rb
+- spec/spec_helper.rb
+- spec/winnie_spec.rb