winnie 0.0.6 → 0.0.7

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+Gemfile.lock

data/lib/winnie/commands/auth.rb

@@ -3,16 +3,15 @@ require 'fileutils'
 module Winnie
   module Commands
     class Auth < Base
-      attr_accessor :api_key
 
       def initialize(*args)
         super(args)
-        load_api_key if api_key_exists?
+        load_api_key if (api_key.nil? and api_key_exists?)
       end
 
       def run
-        confirm('Do you want to change your API key?') if api_key_exists?
-        ask_for_api_key
+        confirm('Do you want to change your API key?') if (api_key.nil? and api_key_exists?)
+        ask_for_api_key if api_key.nil?
         save_api_key
         validate_api_key
       end
@@ -20,7 +19,7 @@ module Winnie
       def ask_for_api_key
         display "Type your Winnie API key"
         display "Key: ", false
-        self.api_key = ask
+        @api_key = ask
       end
 
       def save_api_key
@@ -30,11 +29,11 @@ module Winnie
       end
 
       def load_api_key
-        self.api_key = File.read(api_key_path)
+        @api_key = File.read(api_key_path)
       end
 
       def validate_api_key
-        winnie.account  # If it's not correct, Winnie::Client::UnauthorizedException will be raised
+        winnie.account # If it's not correct, Winnie::Client::UnauthorizedException will be raised
         display 'Your winnie API key is OK!'
       end
 

data/lib/winnie/commands/base.rb

@@ -1,7 +1,7 @@
 module Winnie
   module Commands
     class Base
-      attr_reader :winnie, :args
+      attr_reader :winnie, :args, :api_key
 
       include Winnie::Helpers
 
@@ -17,17 +17,20 @@ module Winnie
           opts.on("-a", "--app [CODE_NAME]", :text, "Run for given application") do |a|
             @code_name = a
           end
+
+          opts.on("-k", "--api-key [API KEY]", :text, "Authorize command for given api key") do |k|
+            @api_key = k
+          end
         end.parse!(@args)
       end
 
       def code_name
-        raise ApplicationNotSpecyfiedException.new unless @code_name
-        @code_name
+        @code_name || raise(ApplicationNotSpecyfiedException.new)
       end
 
       def winnie
-        auth = Winnie::Commands::Auth.new
-        @winnie ||= Winnie::Client.new(auth.api_key)
+        @api_key ||= Winnie::Commands::Auth.new.api_key
+        @winnie ||= Winnie::Client.new(api_key)
       end
 
       def config_path

data/lib/winnie/commands/help.rb

@@ -2,7 +2,7 @@ module Winnie
   module Commands
     class Help < Base
       def run
-        display_columns 'auth', 'Configure your winnie username and password'
+        display_columns 'auth', 'Configure your winnie api key'
         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'

data/lib/winnie/version.rb

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

data/spec/client_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "spec_helper"
 
 describe Winnie::Client do
   before do
@@ -40,10 +40,10 @@ describe Winnie::Client do
     end
 
     def request_parameters(path, method, payload = {})
-      {:payload => ({:api_key => 'secret_one'}.merge(payload)).to_json,
-       :method  => method,
-       :headers => {:accept => :json, :content_type => :json},
-       :url     => "https://admin.winniecloud.com#{path}"
+       {:method  => method,
+        :url     => "https://admin.winniecloud.com#{path}",
+        :headers => {:accept => :json, :content_type => :json},
+        :payload => ({:api_key => 'secret_one'}.merge(payload)).to_json
        }
     end
   end

data/spec/command_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "spec_helper"
 
 describe Winnie::Command do
   describe "run" do

data/spec/commands/app_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe Winnie::Commands::App do
   before do

data/spec/commands/auth_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe Winnie::Commands::Auth do
   include FakeFS::SpecHelpers
@@ -23,6 +23,14 @@ describe Winnie::Commands::Auth do
         auth.api_key.should == 'NobodyKnowsIt'
       end
     end
+
+    describe "when API key is passed as an option" do
+      before { @auth = Winnie::Commands::Auth.new("--api-key", "secret") }
+
+      it "should be set" do
+        @auth.api_key.should == "secret"
+      end
+    end
   end
 
   describe "run" do
@@ -56,11 +64,30 @@ describe Winnie::Commands::Auth do
         @auth.run
       end
     end
+
+    describe "when API key is passed as an option" do
+      before do
+        @auth = Winnie::Commands::Auth.new("--api-key", "secret")
+        @auth.stub(:save_api_key)
+        @auth.stub(:validate_api_key)
+      end
+
+      it "should not ask for API key" do
+        @auth.should_not_receive(:ask_for_api_key)
+        @auth.run
+      end
+
+      it "should not prompt confirm" do
+        @auth.stub(:api_key_exists? => true)
+        @auth.should_not_receive(:confirm)
+        @auth.run
+      end
+    end
   end
 
   describe "save_api_key" do
     before do
-      @auth.api_key = 'secret_api_key'
+      @auth.instance_variable_set("@api_key", 'secret_api_key')
       @auth.stub(:set_credentials_permissions => true)
     end
 

data/spec/commands/base_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe Winnie::Commands::Base do
   describe "config_path" do

data/spec/winnie_spec.rb

@@ -1 +1 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "spec_helper"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: winnie
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - winnie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
+date: 2011-03-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -154,15 +153,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: winnie
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Winnie command line tool
-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
+test_files: []
+

data/Gemfile.lock

@@ -1,34 +0,0 @@
-PATH
-  remote: .
-  specs:
-    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.5.1)
-    mime-types (1.16)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    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.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ZenTest
-  fakefs
-  rspec (~> 2.2.0)
-  winnie!