shelly 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree

data/README.md

@@ -1,4 +1,4 @@
-# shelly: Shelly Cloud command line tool
+# shelly: Shelly Cloud command line tool [![Build Status](https://secure.travis-ci.org/Ragnarson/shelly.png)](http://travis-ci.org/Ragnarson/shelly.png)
 
 ## Installation
 

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+task :default => :spec
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = %w(-fs --color)

data/lib/shelly.rb

@@ -1,8 +1,10 @@
 require "rubygems"
 require "thor"
 require "core_ext/object"
+require "shelly/helpers"
 
 module Shelly
-  autoload :VERSION, "shelly/version"
   autoload :Client, "shelly/client"
+  autoload :User, "shelly/user"
+  autoload :VERSION, "shelly/version"
 end

data/lib/shelly/cli.rb

@@ -1,9 +1,10 @@
 require "shelly"
+require "shelly/user"
 
 module Shelly
   class CLI < Thor
+    include Helpers
     include Thor::Actions
-    autoload :User, "shelly/user"
 
     map %w(-v --version) => :version
     desc "version", "Displays shelly version"
@@ -16,7 +17,7 @@ module Shelly
       email_question = User.guess_email.blank? ? "Email:" : "Email (default #{User.guess_email}):"
       email = ask(email_question)
       email = User.guess_email if email.blank?
-      password = ask("Password:")
+      password = ask_for_password
 
       if email.blank? or password.blank?
         say "Email and password can't be blank" and exit 1
@@ -31,5 +32,15 @@ module Shelly
         e.errors.each { |error| say "#{error.first} #{error.last}" }
       end
     end
+
+    no_tasks do
+      def ask_for_password
+        say "Password: "
+        echo_off
+        password = $stdin.gets.strip
+        echo_on
+        password
+      end
+    end
   end
 end

data/lib/shelly/client.rb

@@ -41,16 +41,26 @@ module Shelly
     end
 
     def request(path, method, params = {})
+      options = request_parameters(path, method, params)
+      RestClient::Request.execute(options) do |response, request|
+        process_response(response)
+      end
+    end
+
+    def headers
+      {:accept          => :json,
+       :content_type    => :json,
+       "shelly-version" => Shelly::VERSION}
+    end
+
+    def request_parameters(path, method, params = {})
       unless @email.blank? or @password.blank?
         params.merge!(:email => @email, :password => @password)
       end
-
-      RestClient::Request.execute(
-        :method   => method,
-        :url      => "#{api_url}#{path}",
-        :headers  => headers,
-        :payload  => params.to_json
-      ) { |response, request| process_response(response) }
+      {:method   => method,
+       :url      => "#{api_url}#{path}",
+       :headers  => headers,
+       :payload  => params.to_json}
     end
 
     def process_response(response)
@@ -68,11 +78,5 @@ module Shelly
         raise UnsupportedResponseException.new(e)
       end
     end
-
-    def headers
-      {:accept          => :json,
-       :content_type    => :json,
-       "shelly-version" => Shelly::VERSION}
-    end
   end
 end

data/lib/shelly/helpers.rb

@@ -0,0 +1,11 @@
+module Shelly
+  module Helpers
+    def echo_off
+      system "stty -echo"
+    end
+
+    def echo_on
+      system "stty echo"
+    end
+  end
+end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/shelly.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "shelly"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
   if RUBY_PLATFORM =~ /darwin/

data/spec/shelly/client_spec.rb

@@ -23,57 +23,52 @@ describe Shelly::Client do
     end
   end
 
-  describe "#request" do
-    it "should make a request to given URL" do
-      RestClient::Request.should_receive(:execute).with(
-        request_parameters("/account", :get)
-      )
-      @client.request("/account", :get)
+  describe "#register_user" do
+    it "should send post request with login and password" do
+      @client.should_receive(:post).with("/users", {:user => {:email => "test@example.com", :password => "secret"}})
+      @client.register_user("test@example.com", "secret")
     end
+  end
 
-    it "should include provided parameters in the request" do
-      RestClient::Request.should_receive(:execute).with(
-        request_parameters("/account", :post, {:name => "test"})
-      )
-      @client.request("/account", :post, :name => "test")
+  describe "#request_parameters" do
+    it "should return hash of resquest parameters" do
+      expected = {
+        :method => :post,
+        :url => "#{@client.api_url}/account",
+        :headers => @client.headers,
+        :payload => {:name => "bob", :email => "bob@example.com", :password => "secret"}.to_json
+      }
+      @client.request_parameters("/account", :post, :name => "bob").should == expected
     end
 
-    it "should include user credentials in the request parameters" do
-      @client = Shelly::Client.new("megan-fox@example.com", "secret")
-      RestClient::Request.should_receive(:execute).with(
-        request_parameters("/account", :get, {:email => "megan-fox@example.com", :password => "secret"})
-      )
-      @client.request("/account", :get)
+    it "should not include user credentials when they are blank" do
+      client = Shelly::Client.new
+      expected = {
+        :method => :get,
+        :url => "#{@client.api_url}/account",
+        :headers => @client.headers,
+        :payload => {}.to_json
+      }
+      client.request("/account", :get)
     end
+  end
 
-    it "should not include user credentials when they are blank" do
-      @client = Shelly::Client.new
-      RestClient::Request.should_receive(:execute).with(
-        :method  => :get,
-        :url     => "https://admin.winniecloud.com/apiv2/account",
-        :headers => {:accept => :json, :content_type => :json, "shelly-version" => Shelly::VERSION},
-        :payload => "{}"
-      )
-      @client.request("/account", :get)
+  describe "#request" do
+    it "should get request parameters" do
+      @client.should_receive(:request_parameters)\
+        .with("/account", :get, {:sth => "foo"})\
+        .and_return({:method => :get})
+      RestClient::Request.should_receive(:execute).with({:method => :get})
+      @client.request("/account", :get, {:sth => "foo"})
     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)
-
+      RestClient::Request.stub(:execute).and_yield(response, request)
       @client.request("/account", :get)
     end
-
-    def request_parameters(path, method, payload = {})
-       {:method  => method,
-        :url     => "https://admin.winniecloud.com/apiv2#{path}",
-        :headers => {:accept => :json, :content_type => :json, "shelly-version" => Shelly::VERSION},
-        :payload => ({:email => "bob@example.com", :password => "secret"}.merge(payload)).to_json}
-    end
   end
 
   describe "#process_response" do
@@ -135,6 +130,17 @@ describe Shelly::Client do
     end
   end
 
+  describe "#headers" do
+    it "should return hash of headers" do
+      expected = {
+        :accept          => :json,
+        :content_type    => :json,
+        "shelly-version" => Shelly::VERSION
+      }
+      @client.headers.should == expected
+    end
+  end
+
   describe "#get" do
     it "should make GET request to given path" do
       @client.should_receive(:request).with("/account", :get)

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require "rspec"
-require "helpers"
 require "shelly"
-require "io_ext"
+require "helpers"
 require "input_faker"
 require "fakefs/safe"
 require "fakefs/spec_helpers"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 +02:00
+date: 2011-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: guard
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: guard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +61,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: growl_notify
+  name: guard-rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,7 +75,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rb-fsevent
+  name: growl_notify
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -89,7 +89,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: fakefs
+  name: rb-fsevent
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -103,7 +103,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: fakefs
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -114,10 +114,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: thor
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -131,7 +131,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rest-client
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -144,6 +144,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id010
 description: Tool for managing applications and clouds at shellycloud.com
 email: 
 - support@shellycloud.com
@@ -155,6 +169,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - README.md
@@ -164,12 +179,12 @@ files:
 - lib/shelly.rb
 - lib/shelly/cli.rb
 - lib/shelly/client.rb
+- lib/shelly/helpers.rb
 - lib/shelly/user.rb
 - lib/shelly/version.rb
 - shelly.gemspec
 - spec/helpers.rb
 - spec/input_faker.rb
-- spec/io_ext.rb
 - spec/shelly/cli_spec.rb
 - spec/shelly/client_spec.rb
 - spec/shelly/user_spec.rb
@@ -211,7 +226,6 @@ summary: Shelly Cloud command line tool
 test_files: 
 - spec/helpers.rb
 - spec/input_faker.rb
-- spec/io_ext.rb
 - spec/shelly/cli_spec.rb
 - spec/shelly/client_spec.rb
 - spec/shelly/user_spec.rb

data/spec/io_ext.rb

@@ -1,5 +0,0 @@
-class IO
-  def read_available_bytes
-    readpartial(100000)
-  end
-end