shelly 0.0.29 → 0.0.30

data/lib/shelly/app.rb

@@ -41,9 +41,8 @@ module Shelly
       self.environment = response["environment"]
     end
 
-    def delete(code_name)
+    def delete
       shelly.delete_app(code_name)
-      #response = shelly.delete_app(code_name)
     end
 
     def create_cloudfile

data/lib/shelly/cli/main.rb

@@ -209,7 +209,7 @@ module Shelly
         user = Shelly::User.new
         user.token
         if code_name.present?
-          app = Shelly::App.new
+          app = Shelly::App.new(code_name)
           say "You are about to delete application: #{code_name}."
           say "Press Control-C at any moment to cancel."
           say "Please confirm each question by typing yes and pressing Enter."
@@ -217,7 +217,7 @@ module Shelly
           ask_to_delete_files
           ask_to_delete_database
           ask_to_delete_application
-          app.delete(code_name)
+          app.delete
           say_new_line
           say "Scheduling application delete - done"
           if App.inside_git_repository?

data/lib/shelly/client.rb

@@ -25,6 +25,8 @@ module Shelly
       end
 
       def unauthorized?
+        # FIXME: Return unauthorized if user has no access to cloud
+        #        Return 404 if cloud doesn't exist, should be fixed in API
         message == "Unauthorized" || message =~ /Cloud .+ not found/
       end
 

data/lib/shelly/helpers.rb

@@ -69,7 +69,7 @@ module Shelly
         exit 1
       end
       @app = Shelly::App.new
-      @app.code_name = cloud.nil? ? clouds.first : cloud
+      @app.code_name = cloud || clouds.first
     end
 
   end

data/lib/shelly/templates/Cloudfile.erb

@@ -1,8 +1,7 @@
 <%= @code_name %>:
   ruby_version: 1.9.2 # 1.9.2 or ree
   environment: production # RAILS_ENV
-  monitoring_email:
-    - <%= @email %>
+  monitoring_email: <%= @email %>
   domains:
     <%- @domains.each do |domain| -%>
     - <%= domain %>

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

data/spec/shelly/app_spec.rb

@@ -59,8 +59,7 @@ describe Shelly::App do
 foo-staging:
   ruby_version: 1.9.2 # 1.9.2 or ree
   environment: production # RAILS_ENV
-  monitoring_email:
-    - bob@example.com
+  monitoring_email: bob@example.com
   domains:
     - foo-staging.winniecloud.com
     - foo.example.com

data/spec/shelly/cli/main_spec.rb

@@ -734,6 +734,7 @@ OUT
       end
 
       it "should return exit 1 when user doesn't type 'yes'" do
+        @app.should_not_receive(:delete)
         lambda{
           fake_stdin(["yes", "yes", "no"]) do
             @main.delete("foo-bar")

metadata

@@ -1,174 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 37
+version: !ruby/object:Gem::Version
+  version: 0.0.30
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 29
-  version: 0.0.29
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70153945354720 !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: *70153945354720
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70153945354300 !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: *70153945354300
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70153945353880 !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: *70153945353880
+- !ruby/object:Gem::Dependency
   name: guard-rspec
+  requirement: &70153945353460 !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: *70153945353460
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &70153945353000 !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: *70153945353000
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70153945352580 !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: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70153945352580
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70153945352160 !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: *70153945352160
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70153945351740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70153945351740
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
+  requirement: &70153945351240 !ruby/object:Gem::Requirement
+    none: false
+    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: *70153945351240
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70153945350820 !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: *70153945350820
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70153945350280 !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: *70153945350280
+- !ruby/object:Gem::Dependency
+  name: wijet-launchy
+  requirement: &70153945365700 !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
+  prerelease: false
+  version_requirements: *70153945365700
 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
@@ -211,36 +193,39 @@ 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: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 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/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/model_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb