shelly 0.2.20 → 0.2.21

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2E2MzQxMDcyNzUwM2RhMWE5OTZlNWM4MGFhODFjN2Q2YWI3YjcyNA==
+  data.tar.gz: !binary |-
+    YTVkMDU5NmZhYTFlYWExNTNiYzE5YzYzYThmMTYzODliMDQ1NGU4ZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTI3YmJmZjliYjk4ZDU1MGNjMDNkNGY5NTdkNGI3ZGRjMTY4ZGMwN2JjZjQ5
+    YWZjMGQ0YjEyNzI4MDAyMWFhNjNiN2VlOTkxNjM4OGNkZGY5ZDU5NTZhNDk4
+    OGI5ZjNlZDFlZGM4YzU5N2NmM2Y2MWM1N2JlNmNlZjIwNDE2YzA=
+  data.tar.gz: !binary |-
+    NTUwMzg3ZTkwY2I4Mzk0ZjMzNzE3MTkzY2EyOWZmNGQzODIyNWU2NmYwMTQz
+    Y2I2YzgyOTU3MzczZDNjMzU0NzBmMTg5OGViNWViYTQ4ODE3ZmQxNzI3ZjYy
+    ZWNhNmY3Y2U3MTlhZmJkNTYzZTA5ZmUzZWFjODgzOTE0MmEwODU=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.21 / 2013-05-13
+
+* [improvement] require 'puma' or 'thin' gems if present in Cloudfile when running `shelly check`
+
 ## 0.2.20 / 2013-05-09
 
 * [improvement] `shelly info`, `shelly list` and `shelly organization list` now use the new state_description attribute returned by Shelly API

data/lib/shelly/app.rb

@@ -297,6 +297,18 @@ module Shelly
       option?("sidekiq")
     end
 
+    # Public: Thin app servers present?
+    # Returns true if thin is present
+    def thin?
+      option?("thin")
+    end
+
+    # Public: Puma app servers present?
+    # Returns true if puma is present
+    def puma?
+      option?("puma")
+    end
+
     # Public: Return databases to backup for given Cloud in Cloudfile
     # Returns Array of databases, except redis db
     def backup_databases

data/lib/shelly/cli/main.rb

@@ -446,7 +446,7 @@ Wait until cloud is in 'turned off' state and try again.}
         print_check(structure.gem?("thin") || structure.gem?("puma"),
           "Web server gem is present",
           "Missing web server gem in Gemfile. Currently supported: 'thin' and 'puma'",
-          :show_fulfilled => verbose)
+          :show_fulfilled => verbose, :failure_level => :warning)
 
         print_check(structure.gem?("rake"), "Gem 'rake' is present",
           "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
@@ -487,6 +487,20 @@ Wait until cloud is in 'turned off' state and try again.}
                 "Gem 'sidekiq' is missing in the Gemfile for '#{app}' cloud",
                 :show_fulfilled => verbose)
             end
+
+            if app.thin?
+              print_check(structure.gem?("thin"),
+                "Web server gem 'thin' is present",
+                "Gem 'thin' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
+
+            if app.puma?
+              print_check(structure.gem?("puma"),
+                "Web server gem 'puma' is present",
+                "Gem 'puma' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
           end
         end
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.20"
+  VERSION = "0.2.21"
 end

data/spec/shelly/app_spec.rb

@@ -493,6 +493,34 @@ describe Shelly::App do
     end
   end
 
+  describe "#thin?" do
+    it "should return true if present" do
+      content = {"servers" => {"app1" => {"thin" => 1}}}
+      @app.stub(:content).and_return(content)
+      @app.thin?.should be_true
+    end
+
+    it "should return false if not present" do
+      content = {"servers" => {"app1" => {"size" => "small"}}}
+      @app.stub(:content).and_return(content)
+      @app.thin?.should be_false
+    end
+  end
+
+  describe "#puma?" do
+    it "should return true if present" do
+      content = {"servers" => {"app1" => {"puma" => true}}}
+      @app.stub(:content).and_return(content)
+      @app.puma?.should be_true
+    end
+
+    it "should return false if not present" do
+      content = {"servers" => {"app1" => {"size" => "small"}}}
+      @app.stub(:content).and_return(content)
+      @app.puma?.should be_false
+    end
+  end
+
   describe "#application_logs_tail" do
     it "should execute given block for logs fetched from API" do
       @client.should_receive(:application_logs_tail).with("foo-staging").and_yield("GET / 127.0.0.1")

data/spec/shelly/cli/main_spec.rb

@@ -1557,7 +1557,7 @@ Wait until cloud is in 'turned off' state and try again.")
       context "when neither thin nor puma present in Gemfile" do
         it "should show that necessary gem doesn't exist" do
           Bundler::Definition.stub_chain(:build, :specs, :map).and_return([])
-          $stdout.should_receive(:puts).with("  #{red("✗")} Missing web server gem in Gemfile. Currently supported: 'thin' and 'puma'")
+          $stdout.should_receive(:puts).with("  #{yellow("ϟ")} Missing web server gem in Gemfile. Currently supported: 'thin' and 'puma'")
           invoke(@main, :check)
         end
       end
@@ -1612,7 +1612,7 @@ Wait until cloud is in 'turned off' state and try again.")
       before do
         cloud = mock(:code_name => "foo-staging", :cloud_databases => ["postgresql"],
           :whenever? => true, :delayed_job? => true, :sidekiq? => true,
-          :to_s => "foo-staging")
+          :thin? => true, :puma? => true, :to_s => "foo-staging")
         cloudfile = mock(:clouds => [cloud])
 
         Shelly::Cloudfile.stub(:new).and_return(cloudfile)
@@ -1676,6 +1676,34 @@ Wait until cloud is in 'turned off' state and try again.")
           invoke(@main, :check)
         end
       end
+
+      context "thin web server" do
+        it "should show that necessary gem doesn't exist" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return([])
+          $stdout.should_receive(:puts).with("  #{red("✗")} Gem 'thin' is missing in the Gemfile for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+
+        it "should show that necessary gem exists" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return(["thin"])
+          $stdout.should_receive(:puts).with("  #{green("✓")} Web server gem 'thin' is present")
+          invoke(@main, :check)
+        end
+      end
+
+      context "puma web server" do
+        it "should show that necessary gem doesn't exist" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return([])
+          $stdout.should_receive(:puts).with("  #{red("✗")} Gem 'puma' is missing in the Gemfile for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+
+        it "should show that necessary gem exists" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return(["puma"])
+          $stdout.should_receive(:puts).with("  #{green("✓")} Web server gem 'puma' is present")
+          invoke(@main, :check)
+        end
+      end
     end
 
     context "when bundler raise error" do

metadata

@@ -1,204 +1,207 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    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'
+- !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
-  name: guard
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
-  name: guard-rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
-  name: simplecov
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
-  name: fakefs
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
-  name: fakeweb
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-  name: wijet-thor
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.9
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :runtime
-  name: rest-client
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.9
+- !ruby/object:Gem::Dependency
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :runtime
-  name: json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :runtime
-  name: progressbar
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :runtime
-  name: launchy
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -273,26 +276,46 @@ 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: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 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/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