shelly 0.0.37 → 0.0.38

data/spec/shelly/cli/runner_spec.rb

@@ -3,6 +3,7 @@ require "shelly/cli/runner"
 
 describe Shelly::CLI::Runner do
   before do
+    ENV['SHELLY_DEBUG'] = "false"
     @runner = Shelly::CLI::Runner.new(%w(version --debug))
   end
 
@@ -21,8 +22,15 @@ describe Shelly::CLI::Runner do
     it "should be true if args include --debug option" do
       @runner.should be_debug
     end
+    
+    it "should be true if SHELLY_DEBUG is set to true" do
+      runner = Shelly::CLI::Runner.new
+      runner.should_not be_debug
+      ENV['SHELLY_DEBUG'] = "true"
+      runner.should be_debug
+    end
 
-    it "should be failse if args doesn't include --debug option" do
+    it "should be false if args doesn't include --debug option" do
       runner = Shelly::CLI::Runner.new(%w(version))
       runner.should_not be_debug
     end

data/spec/shelly/cli/user_spec.rb

@@ -5,11 +5,13 @@ describe Shelly::CLI::User do
   before do
     FileUtils.stub(:chmod)
     @cli_user = Shelly::CLI::User.new
+    Shelly::CLI::User.stub(:new).and_return(@cli_user)
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     Shelly::User.stub(:guess_email).and_return("")
     $stdout.stub(:puts)
     $stdout.stub(:print)
+    @client.stub(:token).and_return("abc")
   end
 
   describe "#help" do
@@ -17,7 +19,7 @@ describe Shelly::CLI::User do
       $stdout.should_receive(:puts).with("Tasks:")
       $stdout.should_receive(:puts).with(/add \[EMAIL\]\s+# Add new developer to clouds defined in Cloudfile/)
         $stdout.should_receive(:puts).with(/list\s+# List users with access to clouds defined in Cloudfile/)
-      @cli_user.help
+      invoke(@cli_user, :help)
     end
   end
 
@@ -35,7 +37,7 @@ describe Shelly::CLI::User do
       Shelly::App.stub(:inside_git_repository?).and_return(false)
       $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
       lambda {
-        @cli_user.list
+        invoke(@cli_user, :list)
       }.should raise_error(SystemExit)
     end
 
@@ -43,7 +45,18 @@ describe Shelly::CLI::User do
       File.delete("Cloudfile")
       $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
       lambda {
-        @cli_user.list
+        invoke(@cli_user, :list)
+      }.should raise_error(SystemExit)
+    end
+
+    it "should exit if user is not logged in" do
+      response = {"message" => "Unauthorized", "url" => "https://admin.winniecloud.com/users/password/new"}
+      exception = Shelly::Client::APIError.new(response.to_json, 404)
+      @client.stub(:token).and_raise(exception)
+      $stdout.should_receive(:puts).with(red "You are not logged in. To log in use:")
+      $stdout.should_receive(:puts).with("  shelly login")
+      lambda {
+        invoke(@cli_user, :list)
       }.should raise_error(SystemExit)
     end
 
@@ -51,14 +64,14 @@ describe Shelly::CLI::User do
       it "should receive clouds from the Cloudfile" do
         @client.stub(:app_users).and_return(response)
         @cloudfile.should_receive(:clouds).and_return(["foo-staging", "foo-production"])
-        @cli_user.list
+        invoke(@cli_user, :list)
       end
 
       it "should display clouds and users" do
         @client.stub(:app_users).and_return(response)
         $stdout.should_receive(:puts).with("Cloud foo-production:")
         $stdout.should_receive(:puts).with("  user@example.com")
-        @cli_user.list
+        invoke(@cli_user, :list)
       end
     end
 
@@ -72,7 +85,7 @@ describe Shelly::CLI::User do
         exception = Shelly::Client::APIError.new(response.to_json, 404)
         @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
+        invoke(@cli_user, :list)
       end
     end
   end
@@ -93,7 +106,7 @@ describe Shelly::CLI::User do
       File.delete("Cloudfile")
       $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
       lambda {
-        @cli_user.add
+        invoke(@cli_user, :add)
       }.should raise_error(SystemExit)
     end
 
@@ -101,7 +114,7 @@ describe Shelly::CLI::User do
       Shelly::App.stub(:inside_git_repository?).and_return(false)
       $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
       lambda {
-        @cli_user.add
+        invoke(@cli_user, :add)
       }.should raise_error(SystemExit)
     end
 
@@ -113,17 +126,17 @@ describe Shelly::CLI::User do
 
       it "should ask about email" do
         fake_stdin(["megan@example.com"]) do
-          @cli_user.add
+          invoke(@cli_user, :add)
         end
       end
 
       it "should receive clouds from the Cloudfile" do
-        @cli_user.add("megan@example.com")
+        invoke(@cli_user, :add, "megan@example.com")
       end
 
       it "should receive clouds from the Cloudfile" do
         $stdout.should_receive(:puts).with("\e[32mSending invitation to megan@example.com to work on foo-production\e[0m")
-        @cli_user.add("megan@example.com")
+        invoke(@cli_user, :add, "megan@example.com")
       end
     end
 
@@ -133,7 +146,7 @@ describe Shelly::CLI::User do
         exception = Shelly::Client::APIError.new(response.to_json, 404)
         @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")
+        invoke(@cli_user, :add, "megan@example.com")
       end
     end
   end

data/spec/shelly/client_spec.rb

@@ -167,12 +167,13 @@ describe Shelly::Client do
       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, api_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"}
+  
+  describe "#app" do
+    it "should fetch app from API" do
+      FakeWeb.register_uri(:get, api_url("apps/staging-foo"), 
+        :body => {:web_server_ip => "192.0.2.1", :mail_server_ip => "192.0.2.3"}.to_json)
+      response = @client.app("staging-foo")
+      response.should == {"web_server_ip" => "192.0.2.1", "mail_server_ip" => "192.0.2.3"}
     end
   end
 

data/spec/shelly/cloudfile_spec.rb

@@ -22,4 +22,15 @@ describe Shelly::Cloudfile do
     end
   end
 
+  it "should allow improper yaml that works with syck" do
+    yaml = %Q{domains:
+  - *.example.com
+  - example.com
+    }
+    expect {
+      yaml = YAML.load(yaml)
+    }.to_not raise_error
+    yaml.should == {"domains" => ["*.example.com", "example.com"]}
+  end
+
 end

metadata

@@ -1,188 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 85
+version: !ruby/object:Gem::Version
+  version: 0.0.38
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 37
-  version: 0.0.37
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70097785241300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785241300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70097785240660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785240660
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70097785239600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70097785239600
+- !ruby/object:Gem::Dependency
   name: guard-rspec
+  requirement: &70097785238660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785238660
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &70097785238000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785238000
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70097785237460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70097785237460
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70097785236940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785236940
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70097785236460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: wijet-thor
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785236460
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
+  requirement: &70097785235820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 14
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.14.7
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785235820
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70097785235340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785235340
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70097785234800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: wijet-launchy
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785234800
+- !ruby/object:Gem::Dependency
+  name: wijet-launchy
+  requirement: &70097785234140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: progressbar
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70097785234140
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: &70097785233260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *70097785233260
 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
@@ -213,6 +192,7 @@ files:
 - lib/thor/arguments.rb
 - lib/thor/basic.rb
 - lib/thor/options.rb
+- lib/thor/thor.rb
 - shelly.gemspec
 - spec/helpers.rb
 - spec/input_faker.rb
@@ -233,36 +213,49 @@ 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2891070154681735828
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2891070154681735828
 requirements: []
-
 rubyforge_project: shelly
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files: []
-
+test_files:
+- spec/helpers.rb
+- spec/input_faker.rb
+- spec/shelly/app_spec.rb
+- spec/shelly/backup_spec.rb
+- spec/shelly/cli/backup_spec.rb
+- spec/shelly/cli/config_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
+- spec/shelly/client_spec.rb
+- spec/shelly/cloudfile_spec.rb
+- spec/shelly/download_progress_bar_spec.rb
+- spec/shelly/model_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb