shelly 0.0.53 → 0.0.54

data/lib/shelly/app.rb

@@ -12,6 +12,10 @@ module Shelly
       self.code_name = code_name
     end
 
+    def databases=(dbs)
+      @databases = dbs - ['none']
+    end
+
     def add_git_remote
       system("git remote rm #{code_name} > /dev/null 2>&1")
       system("git remote add #{code_name} #{git_url}")

data/lib/shelly/cli/main.rb

@@ -320,8 +320,7 @@ We have been notified about it. We will be adding new resources shortly}
             unless ["code-name", "databases"].all? do |option|
               options.include?(option.to_s) && options[option.to_s] != option.to_s
             end && valid_databases?(options["databases"])
-            # FIXME: ' to `
-              say_error "Try 'shelly help add' for more information"
+              say_error "Try `shelly help add` for more information"
             end
           end
         end
@@ -366,7 +365,7 @@ We have been notified about it. We will be adding new resources shortly}
             databases = ask("Unknown database kind. Supported are: #{kinds.join(", ")}:")
           end while not valid
 
-          databases.empty? ? ["postgresql"] : databases - ["none"]
+          databases.empty? ? ["postgresql"] : databases
         end
 
         def info_adding_cloudfile_to_repository

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.53"
+  VERSION = "0.0.54"
 end

data/spec/shelly/app_spec.rb

@@ -36,6 +36,13 @@ describe Shelly::App do
     end
   end
 
+  describe "#databases=" do
+    it "should remove 'none' as possible database" do
+      @app.databases = %w{none postgresql}
+      @app.databases.should == ['postgresql']
+    end
+  end
+
   describe "#collaborations" do
     it "should fetch app's users" do
       @client.should_receive(:collaborations).with("foo-staging")

data/spec/shelly/cli/main_spec.rb

@@ -303,7 +303,7 @@ OUT
     context "command line options" do
       context "invalid params" do
         it "should show help and exit if not all options are passed" do
-          $stdout.should_receive(:puts).with("\e[31mTry 'shelly help add' for more information\e[0m")
+          $stdout.should_receive(:puts).with("\e[31mTry `shelly help add` for more information\e[0m")
           @main.options = {"code-name" => "foo"}
           lambda {
             invoke(@main, :add)
@@ -311,7 +311,7 @@ OUT
         end
 
         it "should exit if databases are not valid" do
-          $stdout.should_receive(:puts).with("\e[31mTry 'shelly help add' for more information\e[0m")
+          $stdout.should_receive(:puts).with("\e[31mTry `shelly help add` for more information\e[0m")
           @main.options = {"code-name" => "foo", "databases" => ["not existing"]}
           lambda {
             invoke(@main, :add)
@@ -373,10 +373,10 @@ OUT
 
     context "when user provided 'none' database" do
       it "shouldn't take it into account" do
-        @app.should_receive(:databases=).with(["postgresql"])
         fake_stdin(["", "postgresql, none"]) do
           invoke(@main, :add)
         end
+        @app.databases.should == ['postgresql']
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.54
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70355552495420 !ruby/object:Gem::Requirement
+  requirement: &70184900694820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70355552495420
+  version_requirements: *70184900694820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70355552495000 !ruby/object:Gem::Requirement
+  requirement: &70184900694340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552495000
+  version_requirements: *70184900694340
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70355552494540 !ruby/object:Gem::Requirement
+  requirement: &70184900693880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552494540
+  version_requirements: *70184900693880
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70355552494120 !ruby/object:Gem::Requirement
+  requirement: &70184900693460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552494120
+  version_requirements: *70184900693460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70355552493700 !ruby/object:Gem::Requirement
+  requirement: &70184900693040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552493700
+  version_requirements: *70184900693040
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70355552509600 !ruby/object:Gem::Requirement
+  requirement: &70184900692580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552509600
+  version_requirements: *70184900692580
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70355552509180 !ruby/object:Gem::Requirement
+  requirement: &70184900692100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552509180
+  version_requirements: *70184900692100
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70355552508760 !ruby/object:Gem::Requirement
+  requirement: &70184900691620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552508760
+  version_requirements: *70184900691620
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70355552508340 !ruby/object:Gem::Requirement
+  requirement: &70184900691080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355552508340
+  version_requirements: *70184900691080
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70355552507840 !ruby/object:Gem::Requirement
+  requirement: &70184900690380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70355552507840
+  version_requirements: *70184900690380
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70355552507420 !ruby/object:Gem::Requirement
+  requirement: &70184900689600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355552507420
+  version_requirements: *70184900689600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70355552506960 !ruby/object:Gem::Requirement
+  requirement: &70184900689140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355552506960
+  version_requirements: *70184900689140
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70355552506540 !ruby/object:Gem::Requirement
+  requirement: &70184900688700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355552506540
+  version_requirements: *70184900688700
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool