shelly 0.2.13 → 0.2.14

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.14 / 2013-03-28
+
+* [bug] Structure validator recognizes puma as allowed web server
+
 ## 0.2.13 / 2013-03-28
 
 * [improvement] More verbose output for redeploy, start and stop

data/lib/shelly/structure_validator.rb

@@ -33,9 +33,9 @@ module Shelly
 
     # Public: Check all requirements that app has to fulfill
     def valid?
-      gemfile? && gemfile_lock? && gem?("thin") &&
-        gem?("rake") && config_ru? && rakefile? &&
-        task?("db:migrate") && task?("db:setup")
+      gemfile? && gemfile_lock? && gem?("rake") &&
+        (gem?("thin") || gem?("puma")) && config_ru? &&
+        rakefile? && task?("db:migrate") && task?("db:setup")
     end
 
     def invalid?

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
 end

data/spec/shelly/structure_validator_spec.rb

@@ -9,14 +9,14 @@ describe Shelly::StructureValidator do
   describe "#gemfile?" do
     context "when Gemfile exists" do
       it "should return true" do
-        @validator.gemfile?.should == true
+        @validator.gemfile?.should be_true
       end
     end
 
     context "when Gemfile doesn't exist" do
       it "should return false" do
         @validator.stub(:repo_paths => ["Gemfile.lock"])
-        @validator.gemfile?.should == false
+        @validator.gemfile?.should be_false
       end
     end
   end
@@ -24,14 +24,14 @@ describe Shelly::StructureValidator do
   describe "#gemfile_lock?" do
     context "when Gemfile.lock exists" do
       it "should return true" do
-        @validator.gemfile_lock?.should == true
+        @validator.gemfile_lock?.should be_true
       end
     end
 
     context "when Gemfile.lock doesn't exist" do
       it "should return false" do
         @validator.stub(:repo_paths => ["Gemfile"])
-        @validator.gemfile_lock?.should == false
+        @validator.gemfile_lock?.should be_false
       end
     end
   end
@@ -39,14 +39,14 @@ describe Shelly::StructureValidator do
   describe "#config_ru?" do
     context "when config.ru exists" do
       it "should return true" do
-        @validator.config_ru?.should == true
+        @validator.config_ru?.should be_true
       end
     end
 
     context "when config.ru doesn't exist" do
       it "should return false" do
         @validator.stub(:repo_paths => ["Gemfile.lock"])
-        @validator.config_ru?.should == false
+        @validator.config_ru?.should be_false
       end
     end
   end
@@ -68,7 +68,6 @@ describe Shelly::StructureValidator do
 
   describe "#gem?" do
     before do
-      @validator.stub(:gemfile? => true, :gemfile_lock? => true)
       Bundler::Definition.stub_chain(:build, :specs).and_return(
         [mock(:name => "thin"), mock(:name => "mysql")])
     end
@@ -98,8 +97,8 @@ describe Shelly::StructureValidator do
 
   describe "#task?" do
     before do
-      @validator.should_receive(:'`').at_most(1).with("rake -P").and_return("rake db:migrate")
-      @validator.stub(:rakefile? => true)
+      @validator.should_receive(:'`').at_most(1).with("rake -P") \
+        .and_return("rake db:migrate")
     end
 
     it "should return true if task is present" do
@@ -117,4 +116,73 @@ describe Shelly::StructureValidator do
       end
     end
   end
+
+  describe "#valid?" do
+    before do
+      @validator.stub(:tasks).and_return(["rake db:migrate", "rake db:setup"])
+      @validator.stub(:gems).and_return(["thin", "rake"])
+    end
+
+    context "when requirements are fulfilled" do
+      context "and 'thin' has been chosen as a web server" do
+        it "should return true" do
+          @validator.valid?.should be_true
+        end
+      end
+
+      context "and 'puma' has been chosen as a web server" do
+        it "should return true" do
+          @validator.stub(:gems).and_return(["puma", "rake"])
+          @validator.valid?.should be_true
+        end
+      end
+    end
+
+    context "when Gemfile doesn't exist" do
+      it "should return false" do
+        @validator.stub(:repo_paths => ["Gemfile.lock", "config.ru", "Rakefile"])
+        @validator.valid?.should be_false
+      end
+    end
+
+    context "when Gemfile.lock doesn't exist" do
+      it "should return false" do
+        @validator.stub(:repo_paths => ["Gemfile", "config.ru", "Rakefile"])
+        @validator.valid?.should be_false
+      end
+    end
+
+    context "when Rakefile doesn't exist" do
+      it "should return false" do
+        @validator.stub(:repo_paths => ["Gemfile", "Gemfile.lock", "config.ru"])
+        @validator.valid?.should be_false
+      end
+    end
+
+    context "when config.ru doesn't exist" do
+      it "should return false" do
+        @validator.stub(:repo_paths => ["Gemfile", "Gemfile.lock", "Rakefile"])
+        @validator.valid?.should be_false
+      end
+    end
+
+    context "when web server is missed" do
+      it "should return false" do
+        @validator.stub(:gems).and_return(["rake"])
+        @validator.valid?.should be_false
+      end
+    end
+
+    context "when task is missed" do
+      it "should return false if db:setup is missing" do
+        @validator.stub(:tasks).and_return(["rake db:migrate"])
+        @validator.valid?.should be_false
+      end
+
+      it "should return false if db:migrate is missing" do
+        @validator.stub(:tasks).and_return(["rake db:setup"])
+        @validator.valid?.should be_false
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
+  prerelease: 
 platform: ruby
 authors:
 - Shelly Cloud team
@@ -11,201 +12,197 @@ cert_chain: []
 date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
-  prerelease: false
-  name: rspec
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  name: rake
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: guard
 - !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  name: guard-rspec
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: simplecov
 - !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: ruby_gntp
 - !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: rb-fsevent
 - !ruby/object:Gem::Dependency
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: fakefs
 - !ruby/object:Gem::Dependency
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: fakeweb
 - !ruby/object:Gem::Dependency
+  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
-  type: :runtime
-  prerelease: false
-  name: wijet-thor
 - !ruby/object:Gem::Dependency
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: rest-client
 - !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: json
 - !ruby/object:Gem::Dependency
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: progressbar
 - !ruby/object:Gem::Dependency
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: launchy
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -276,46 +273,26 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+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/backup_spec.rb
-- spec/shelly/cli/backup_spec.rb
-- spec/shelly/cli/config_spec.rb
-- spec/shelly/cli/deploy_spec.rb
-- spec/shelly/cli/file_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/organization_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/organization_spec.rb
-- spec/shelly/structure_validator_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzAwOWRmMjEyZDA5OWNlOTg1NTJjYzkxNjY1MTFjODA5MzI0NDA5Yw==
-  data.tar.gz: !binary |-
-    NDg0YjA5MTcxMDdkYTE2NDJiY2Q3NDRlNmM2NzJjODk1ZDM2NTIxMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjRlYjYzMzUzOGFiMTljNmYxNzNhMWUzMjE5OWZiNmQ0MDFlZjNiMzI1OGIy
-    ZjVkNmQxNWMzMzllZDU1NDcxMmFmMGUyYjA0ZGYwYmY3NGI0ZTJiZjE5NzVj
-    NWU1NzNjZGRkZDc0NjUzYjZiZGE4MjQ2ZWY2ODY3YWE4NzhmODA=
-  data.tar.gz: !binary |-
-    NzYwZGVlMWVlNWY5NTk3ODU0YTM0MzJmNGI2ZjljM2RhODU3MDk4NjMyOTJm
-    MTc1N2I0MWQyZTFiYWNlMmUwZDEzYWI0M2M2ODA2YzNlZWY4Y2JlN2YzZjcw
-    MWQzZjc5MTUwYTFkZmQyZTFiMjQxZmY1NjRiY2M5NzdjODYzNTY=