winnie 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,19 +1,29 @@
 PATH
   remote: .
   specs:
-    winnie (0.0.1)
+    winnie (0.0.2)
       json
       rest-client
 
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     fakefs (0.2.1)
     json (1.4.6)
     mime-types (1.16)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    rspec (1.3.1)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
 
 PLATFORMS
   ruby
@@ -22,5 +32,5 @@ DEPENDENCIES
   fakefs
   json
   rest-client
-  rspec (>= 1.2.9)
+  rspec (~> 2.0.0)
   winnie!

data/Rakefile

@@ -1,10 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 task :default => :spec

data/bin/winnie

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '../lib/winnie/winnie')
+require File.join(File.dirname(__FILE__), '../lib/winnie')
 
 args = ARGV.dup
 ARGV.clear

data/lib/winnie/client.rb

@@ -4,12 +4,8 @@ module Winnie
       @api_key = api_key
     end
 
-    def host
-      ENV['WINNIE_HOST'] || 'admin.winniecloud.net'
-    end
-
     def winnie_url
-      "http://#{host}"
+      ENV['WINNIE_URL'] || 'https://admin.winniecloud.com'
     end
 
     def account

data/lib/winnie/command.rb

@@ -1,27 +1,27 @@
 module Winnie
   class Command
     extend Helpers
-    
+
     def self.run(name, *args)
       begin
         class_name, command_name = name.split(':')
         command_name ||= 'run'
-        
+
         begin
           command_class = eval("Winnie::Commands::#{class_name.capitalize}")
         rescue NameError
           command_class = Winnie::Commands::App
           command_name = class_name
         end
-        
+
         command = command_class.new(args)
-        
+
         if command.respond_to?(command_name)
           command.send(command_name)
         else
           raise UnknownCommandException.new
         end
-        
+
       rescue UnknownCommandException
         error 'Unknown command'
       rescue Winnie::Client::UnauthorizedException

data/lib/winnie/version.rb

@@ -1,3 +1,3 @@
 module Winnie
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/{winnie/winnie.rb → winnie.rb}

@@ -1,11 +1,11 @@
 # TODO: loop here, and load all commands
-module Winnie; end
 require 'rubygems'
 require 'rest_client'
 require 'json'
 require 'optparse'
+require 'winnie/version'
 require 'winnie/helpers'
 require 'winnie/client'
-require 'winnie/command'
 require 'winnie/commands/base'
-Dir["#{File.dirname(__FILE__)}/commands/*"].each { |c| require c }
+require 'winnie/command'
+Dir["#{File.dirname(__FILE__)}/winnie/commands/*"].each { |c| require c }

data/spec/client_spec.rb

@@ -6,7 +6,7 @@ describe Winnie::Client do
     @client = Winnie::Client.new('secret_one')
     RestClient::Request.stub!(:execute)
   end
-  
+
   describe "request" do
     it "should make a request to give URL" do
       RestClient::Request.should_receive(:execute).with(
@@ -14,82 +14,81 @@ describe Winnie::Client do
       )
       @client.request('/account', :get)
     end
-    
+
     it "should include provided parameters in the request" do
       RestClient::Request.should_receive(:execute).with(
-        request_parameters('/account', :post, 
+        request_parameters('/account', :post,
           :payload => {:api_key => 'secret_one', :name => 'test'}
         )
       )
       @client.request('/account', :post, :name => 'test')
     end
-    
+
     it "should include api_key in the request parameters" do
       @client = Winnie::Client.new('AABBCC')
       RestClient::Request.should_receive(:execute).with(
-        request_parameters('/account', :get, 
+        request_parameters('/account', :get,
           :payload => {:api_key => 'AABBCC'}
         )
       )
       @client.request('/account', :get)
     end
-    
+
     it "should accept json responses only" do
       RestClient::Request.should_receive(:execute).with(
-        request_parameters('/account', :get, 
+        request_parameters('/account', :get,
           :headers => {:accept => 'application/json'}
         )
       )
       @client.request('/account', :get)
     end
-    
+
     it "should pass response to process_response method" do
       response = mock(RestClient::Response)
       request = mock(RestClient::Request)
       @client.should_receive(:process_response).with(response)
       RestClient::Request.should_receive(:execute).with(request_parameters('/account', :get)).and_yield(response, request)
-      
+
       @client.request('/account', :get)
     end
-    
-    
+
     def request_parameters(path, method, params = {})
-      {:payload => {:api_key => 'secret_one'}, 
-       :method  => method, 
-       :headers => {:accept => 'application/json'}, 
-       :url     => "http://admin.winniecloud.net#{path}"
+      {:payload => {:api_key => 'secret_one'},
+       :method  => method,
+       :headers => {:accept => 'application/json'},
+       :url     => "https://admin.winniecloud.com#{path}"
        }.merge(params)
     end
   end
-  
+
   describe "process_response" do
     before do
       @response = mock(RestClient::Response, :code => 200, :body => '{}', :return! => nil)
       @request = mock(RestClient::Request)
       RestClient::Request.stub(:execute).and_yield(@response, @request)
     end
-    
+
     it "should not follow redirections" do
       @response.should_receive(:return!)
       @client.get('/account')
     end
-    
+
     it "should raise UnauthorizedException when response has 401 code" do
       @response.stub(:code).and_return(401)
       lambda {
         @client.get('/account')
       }.should raise_error(Winnie::Client::UnauthorizedException)
     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)
-      
+
       lambda {
         @client.get('/account')
       }.should raise_error(Winnie::Client::UnauthorizedException)
     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)
@@ -98,45 +97,45 @@ describe Winnie::Client do
         @client.post('/apps/flower/command', :body => 'puts User.count')
       }.should raise_error(Winnie::Client::ResourceNotFoundException, 'App not found')
     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)
-      
+
       lambda {
         @client.post('/apps/flower/command', :body => 'puts User.count')
       }.should raise_error(Winnie::Client::CommandFailedException, 'random error happened')
     end
   end
-  
+
   it "should make GET request to given path" do
     @client.should_receive(:request).with('/account', :get)
     @client.get('/account')
   end
-  
+
   it "should make POST request to given path with parameters" do
     @client.should_receive(:request).with('/account', :post, :name => 'pink-one')
     @client.post('/account', :name => 'pink-one')
   end
-  
+
   describe "API methods" do
     it "should get the list of user applications" do
       @client.should_receive(:get).with('/apps')
       @client.apps
     end
-    
+
     it "should get account info" do
       @client.should_receive(:get).with('/account')
       @client.account
     end
-    
+
     it "should send command to winnie" do
       @client.should_receive(:post).with('/apps/flower-16/command', :body => 'User[:bob].destroy')
       @client.command('User[:bob].destroy', 'flower-16')
     end
   end
-  
+
   it "should return winnie-app URL" do
-    @client.winnie_url.should == "http://#{@client.host}"
+    @client.winnie_url.should == "https://admin.winniecloud.com"
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
-require 'winnie/winnie'
-require 'spec'
-require 'spec/autorun'
+require 'winnie'
+require 'rspec'
+require 'rspec/autorun'
 require 'fakefs'
 require 'fakefs/spec_helpers'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  config.color_enabled = true
 end

data/winnie.gemspec

@@ -8,11 +8,11 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["winnie"]
   s.email       = ["winnie-devs@ragnarson.com"]
-  s.homepage    = "http://rubygems.org/gems/dupa"
+  s.homepage    = "http://winniecloud.com"
   s.summary     = %Q{Winnie command line tool}
   s.description = %Q{Command line tool which allows interacting with winnie's API}
 
-  s.rubyforge_project = "dupa"
+  s.rubyforge_project = "winnie"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
   s.add_dependency "rest-client"
-  s.add_development_dependency "rspec", ">= 1.2.9"
+  s.add_development_dependency "rspec", "~> 2.0.0"
   s.add_development_dependency "fakefs"
 
   # TODO: remove after few releases

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: winnie
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - winnie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +02:00
+date: 2010-10-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,14 +52,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 15
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/winnie
+- lib/winnie.rb
 - lib/winnie/client.rb
 - lib/winnie/command.rb
 - lib/winnie/commands/app.rb
@@ -101,18 +102,16 @@ files:
 - lib/winnie/commands/help.rb
 - lib/winnie/helpers.rb
 - lib/winnie/version.rb
-- lib/winnie/winnie.rb
 - 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.opts
 - spec/spec_helper.rb
 - spec/winnie_spec.rb
 - winnie.gemspec
 has_rdoc: true
-homepage: http://rubygems.org/gems/dupa
+homepage: http://winniecloud.com
 licenses: []
 
 post_install_message: |
@@ -151,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: dupa
+rubyforge_project: winnie
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
@@ -162,6 +161,5 @@ test_files:
 - spec/commands/app_spec.rb
 - spec/commands/auth_spec.rb
 - spec/commands/base_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/winnie_spec.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color