shelly 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.4 / 2013-02-18
+
+* [feature] Require sidekiq gem if present in Cloudfile when running `shelly check`
+* Changes reflecting new API
+
 ## 0.2.3 / 2013-02-12
 
 * [improvement] Handle stopping clouds in different states

data/lib/shelly/app.rb

@@ -251,6 +251,12 @@ module Shelly
       option?("whenever")
     end
 
+    # Public: Sidekiq enabled?
+    # Returns true if sidekiq is present
+    def sidekiq?
+      option?("sidekiq")
+    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

@@ -301,6 +301,8 @@ Wait until cloud is in 'turned off' state and try again.}
         else
           say "Missing git remote"
         end
+      rescue Client::ConflictException => e
+        say_error e[:message]
       end
 
       desc "logs", "Show latest application logs"
@@ -455,6 +457,13 @@ Wait until cloud is in 'turned off' state and try again.}
                 "Gem 'whenever' is missing in the Gemfile for '#{app}' cloud",
                 :show_fulfilled => verbose)
             end
+
+            if app.sidekiq?
+              print_check(structure.gem?("sidekiq"),
+                "Gem 'sidekiq' is present for '#{app}' cloud",
+                "Gem 'sidekiq' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
           end
         end
 

data/lib/shelly/client.rb

@@ -188,6 +188,10 @@ module Shelly
       post("/apps/#{code_name}/database_backups", :kind => kind)
     end
 
+    def download_backup_url(code_name, filename)
+      get("/apps/#{code_name}/database_backups/#{filename}/download_url")["url"]
+    end
+
     def members(name)
       get("/organizations/#{name}/memberships")
     end
@@ -226,9 +230,12 @@ module Shelly
           end
         end
 
-        options = request_parameters("/apps/#{cloud}/database_backups/#{filename}", :get)
-        options = options.merge(:block_response => process_response,
-          :headers => {:accept => "application/x-gzip"})
+        options = {
+          :url            => download_backup_url(cloud, filename),
+          :method         => :get,
+          :block_response => process_response,
+          :headers => {:accept => "application/x-gzip"}
+        }.merge(http_basic_auth_options)
 
         RestClient::Request.execute(options)
       end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/shelly/app_spec.rb

@@ -430,6 +430,20 @@ describe Shelly::App do
     end
   end
 
+  describe "#sidekiq?" do
+    it "should return true if present" do
+      content = {"servers" => {"app1" => {"sidekiq" => true}}}
+      @app.stub(:content).and_return(content)
+      @app.sidekiq?.should be_true
+    end
+
+    it "should return false if not present" do
+      content = {"servers" => {"app1" => {"size" => "small"}}}
+      @app.stub(:content).and_return(content)
+      @app.sidekiq?.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

@@ -1423,7 +1423,7 @@ Wait until cloud is in 'turned off' state and try again.")
     before do
       Shelly::App.stub(:inside_git_repository?).and_return(true)
       Bundler::Definition.stub_chain(:build, :specs, :map) \
-        .and_return(["thin", "pg", "delayed_job", "whenever"])
+        .and_return(["thin", "pg", "delayed_job", "whenever", "sidekiq"])
       Shelly::StructureValidator.any_instance.stub(:repo_paths) \
         .and_return(["config.ru", "Gemfile", "Gemfile.lock"])
     end
@@ -1495,7 +1495,8 @@ Wait until cloud is in 'turned off' state and try again.")
     context "cloudfile" do
       before do
         cloud = mock(:code_name => "foo-staging", :cloud_databases => ["postgresql"],
-          :whenever? => true, :delayed_job? => true, :to_s => "foo-staging")
+          :whenever? => true, :delayed_job? => true, :sidekiq? => true,
+          :to_s => "foo-staging")
         cloudfile = mock(:clouds => [cloud])
 
         Shelly::Cloudfile.stub(:new).and_return(cloudfile)
@@ -1527,6 +1528,19 @@ Wait until cloud is in 'turned off' state and try again.")
         end
       end
 
+      context "sidekiq is enabled" 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 'sidekiq' is missing in the Gemfile for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+
+        it "should show that necessary gem exists" do
+          $stdout.should_receive(:puts).with("  #{green("✓")} Gem 'sidekiq' is present for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+      end
+
       context "postgresql is enabled" do
         it "should show that necessary gem doesn't exist" do
           Bundler::Definition.stub_chain(:build, :specs, :map).and_return([])

data/spec/shelly/client_spec.rb

@@ -321,14 +321,29 @@ describe Shelly::Client do
     end
   end
 
+  describe "#download_backup_url" do
+    it "should return download backup url" do
+      filename = "2011.11.26.04.00.10.foo.postgres.tar.gz"
+      url = api_url("apps/foo/database_backups/#{filename}/download_url")
+      FakeWeb.register_uri(:get, url, :body => {"url" => "https://backup.example.com/file.gz"}.to_json)
+      @client.download_backup_url("foo", filename).should == "https://backup.example.com/file.gz"
+    end
+  end
+
   describe "#download_backup" do
     before do
       @filename = "2011.11.26.04.00.10.foo.postgres.tar.gz"
-      url = api_url("apps/foo/database_backups/#{@filename}")
+      @client.stub(:download_backup_url => "https://backup.example.com/file.gz")
       response = Net::HTTPResponse.new('', '', '')
       # Streaming
       response.stub(:read_body).and_yield("aaa").and_yield("bbbbb").and_yield("dddf")
-      FakeWeb.register_uri(:get, url, :response => response)
+      FakeWeb.register_uri(:get, "https://bob%40example.com:secret@backup.example.com/file.gz
+", :response => response)
+    end
+
+    it "should fetch from API backup url" do
+      @client.should_receive(:download_backup_url).with("foo", @filename)
+      @client.download_backup("foo", @filename)
     end
 
     it "should write streamed database backup to file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2582762142314582273
+      hash: 2571553387249649782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,10 +326,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2582762142314582273
+      hash: 2571553387249649782
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool