shelly 0.0.28 → 0.0.29

data/spec/shelly/cli/user_spec.rb

@@ -27,6 +27,8 @@ describe Shelly::CLI::User do
       Dir.chdir("/projects/foo")
       File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
       Shelly::App.stub(:inside_git_repository?).and_return(true)
+      @cloudfile = Shelly::Cloudfile.new
+      Shelly::Cloudfile.stub(:new).and_return(@cloudfile)
     end
 
     it "should exit with message if command run outside git repository" do
@@ -47,33 +49,30 @@ describe Shelly::CLI::User do
 
     context "on success" do
       it "should receive clouds from the Cloudfile" do
-        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
-        @client.should_receive(:apps_users).and_return(response)
+        @client.stub(:app_users).and_return(response)
+        @cloudfile.should_receive(:clouds).and_return(["foo-staging", "foo-production"])
         @cli_user.list
       end
 
       it "should display clouds and users" do
-        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
-        @client.stub(:apps_users).and_return(response)
+        @client.stub(:app_users).and_return(response)
         $stdout.should_receive(:puts).with("Cloud foo-production:")
         $stdout.should_receive(:puts).with("  user@example.com")
-        $stdout.should_receive(:puts).with("Cloud foo-staging:")
-        $stdout.should_receive(:puts).with("  user2@example.com")
         @cli_user.list
       end
     end
 
     def response
-      [{'code_name' => 'foo-production', 'users' => [{'email' => 'user@example.com'}]},
-       {'code_name' => 'foo-staging', 'users' => [{'name' => 'username2','email' => 'user2@example.com'}]}]
+      [{'email' => 'user@example.com'}]
     end
 
     context "on failure" do
       it "should raise an error if user does not have access to cloud" do
-        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}])
-        @client.stub(:apps_users).and_return(response)
-        $stdout.should_receive(:puts).with("\e[31mYou have no access to 'foo-staging' cloud defined in Cloudfile\e[0m")
-        lambda { @cli_user.list }.should raise_error(SystemExit)
+        response = {"message" => "Cloud foo-staging not found"}
+        exception = Shelly::Client::APIError.new(response.to_json)
+        @client.stub(:app_users).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
+        @cli_user.list
       end
     end
   end
@@ -94,7 +93,7 @@ describe Shelly::CLI::User do
       File.delete("Cloudfile")
       $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
       lambda {
-        @cli_user.list
+        @cli_user.add
       }.should raise_error(SystemExit)
     end
 
@@ -110,7 +109,6 @@ describe Shelly::CLI::User do
       before do
         @client.should_receive(:send_invitation).with("foo-production", "megan@example.com")
         @client.should_receive(:send_invitation).with("foo-staging", "megan@example.com")
-        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
       end
 
       it "should ask about email" do
@@ -131,9 +129,11 @@ describe Shelly::CLI::User do
 
     context "on failure" do
       it "should raise error if user doesnt have access to cloud" do
-        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}])
-        $stdout.should_receive(:puts).with("\e[31mYou have no access to 'foo-staging' cloud defined in Cloudfile\e[0m")
-        lambda { @cli_user.add("megan@example.com") }.should raise_error(SystemExit)
+        response = {"message" => "Cloud foo-staging not found"}
+        exception = Shelly::Client::APIError.new(response.to_json)
+        @client.stub(:send_invitation).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
+        @cli_user.add("megan@example.com")
       end
     end
   end

data/spec/shelly/client_spec.rb

@@ -100,6 +100,17 @@ describe Shelly::Client do
     end
   end
 
+  describe "#cloud_logs" do
+    it "should send get request" do
+      time = Time.now
+      FakeWeb.register_uri(:get, @url + "/apps/staging-foo/deploys", :body => [{:failed => false, :created_at => time},
+        {:failed => true, :created_at => time+1}].to_json)
+      response = @client.cloud_logs("staging-foo")
+      response.should == [{"failed"=>false, "created_at"=>time.to_s},
+             {"failed"=>true, "created_at"=>(time+1).to_s}]
+    end
+  end
+
   describe "#create_app" do
     it "should send post with app's attributes" do
       @client.should_receive(:post).with("/apps", :app => {:code_name => "foo", :ruby_version => "1.9.2"})
@@ -108,11 +119,19 @@ describe Shelly::Client do
   end
 
   describe "#app_users" do
-    it "should send post with app code_names" do
-      FakeWeb.register_uri(:get, @url + "/apps/staging-foo/users", :body => {:code_name => "staging-foo"}.to_json)
-      FakeWeb.register_uri(:get, @url + "/apps/production-foo/users", :body => {:code_name => "production-foo"}.to_json)
-      response = @client.apps_users(["staging-foo", "production-foo"])
-      response.should == [{"code_name" => "staging-foo"}, {"code_name" => "production-foo"}]
+    it "should send get request with app code_names" do
+      FakeWeb.register_uri(:get, @url + "/apps/staging-foo/users", :body => [{:email => "test@example.com"},
+        {:email => "test2@example.com"}].to_json)
+      response = @client.app_users("staging-foo")
+      response.should == [{"email" => "test@example.com"}, {"email" => "test2@example.com"}]
+    end
+  end
+
+  describe "#app_ips" do
+    it "should send get request with app code_name" do
+      FakeWeb.register_uri(:get, @url + "/apps/staging-foo/ips", :body => {:mail_server_ip => "10.0.1.1", :web_server_ip => "88.198.21.187"}.to_json)
+      response = @client.app_ips("staging-foo")
+      response.should == {"mail_server_ip" => "10.0.1.1", "web_server_ip" => "88.198.21.187"}
     end
   end
 
@@ -139,6 +158,22 @@ describe Shelly::Client do
     end
   end
 
+  describe "#start_cloud" do
+    it "should sent post request with cloud's code_name" do
+      FakeWeb.register_uri(:put, @url + "/apps/staging-foo/start", :body => {}.to_json)
+      response = @client.start_cloud("staging-foo")
+      response.should == {}
+    end
+  end
+
+  describe "#stop_cloud" do
+    it "should sent delete request with cloud's code_name" do
+      FakeWeb.register_uri(:put, @url + "/apps/staging-foo/stop", :body => {}.to_json)
+      response = @client.stop_cloud("staging-foo")
+      response.should == {}
+    end
+  end
+
   describe "#ssh_key_available?" do
     it "should send get request with ssh key" do
       @client.should_receive(:get).with("/users/new", {:ssh_key => "ssh-key Abb"})
@@ -246,5 +281,16 @@ describe Shelly::Client do
       @client.put("/account", :name => "new-one")
     end
   end
-end
 
+  describe "#delete" do
+    it "should make DELETE request to given path with parameters" do
+      @client.should_receive(:request).with("/account", :delete, :name => "new-one")
+      @client.delete("/account", :name => "new-one")
+    end
+
+    it "should make DELETE request to apps with parameters" do
+      @client.should_receive(:request).with("/apps/new-one", :delete, {})
+      @client.delete("/apps/new-one")
+    end
+  end
+end

data/spec/shelly/cloudfile_spec.rb

@@ -22,17 +22,4 @@ describe Shelly::Cloudfile do
     end
   end
 
-  describe "#fetch_users" do
-    it "should return array to display with clouds and users" do
-      @cloudfile.write(@hash)
-      @client.should_receive(:apps_users).and_return(response)
-      response = @cloudfile.fetch_users
-      response.should == {"foo-staging" => ["user@example.com"]}
-    end
-
-    def response
-      [{'code_name' => 'foo-staging','users' => [{'email' => 'user@example.com'}]}]
-    end
-  end
-
 end

metadata

@@ -1,156 +1,174 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.28
+version: !ruby/object:Gem::Version 
+  hash: 37
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 29
+  version: 0.0.29
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2153283640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *2153283640
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2153283180 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153283180
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &2153282720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *2153282720
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &2153282300 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
-  version_requirements: *2153282300
-- !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &2153281780 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
   prerelease: false
-  version_requirements: *2153281780
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &2153281320 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2153281320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &2153280800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2153280800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &2153280240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2153280240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: wijet-thor
-  requirement: &2153278840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 14
+        - 7
         version: 0.14.7
   type: :runtime
-  prerelease: false
-  version_requirements: *2153278840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &2153278380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153278380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2153277920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153277920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: wijet-launchy
-  requirement: &2153277320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153277320
+  version_requirements: *id010
 description: Tool for managing applications and clouds at shellycloud.com
-email:
+email: 
 - support@shellycloud.com
-executables:
+executables: 
 - shelly
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -163,6 +181,7 @@ files:
 - lib/shelly.rb
 - lib/shelly/app.rb
 - lib/shelly/cli/command.rb
+- lib/shelly/cli/deploys.rb
 - lib/shelly/cli/main.rb
 - lib/shelly/cli/runner.rb
 - lib/shelly/cli/user.rb
@@ -174,11 +193,13 @@ files:
 - lib/shelly/user.rb
 - lib/shelly/version.rb
 - lib/thor/arguments.rb
+- lib/thor/basic.rb
 - lib/thor/options.rb
 - shelly.gemspec
 - spec/helpers.rb
 - spec/input_faker.rb
 - spec/shelly/app_spec.rb
+- spec/shelly/cli/deploys_spec.rb
 - spec/shelly/cli/main_spec.rb
 - spec/shelly/cli/runner_spec.rb
 - spec/shelly/cli/user_spec.rb
@@ -190,38 +211,36 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files:
-- spec/helpers.rb
-- spec/input_faker.rb
-- spec/shelly/app_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/runner_spec.rb
-- spec/shelly/cli/user_spec.rb
-- spec/shelly/client_spec.rb
-- spec/shelly/cloudfile_spec.rb
-- spec/shelly/model_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []
+