shelly 0.1.38 → 0.1.39

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.39 / 2013-01-08
+
+* [feature] Added `shelly deploys pending` - displays a list of commits which are not deployed to Shelly Cloud yet.
+
 ## 0.1.38 / 2012-12-20
 
 * [improvement] Using logs streaming server for logs tail (`shelly logs -f`). Logs are displayed more fluently.

data/lib/shelly/app.rb

@@ -211,7 +211,7 @@ module Shelly
     end
 
     def edit_billing_url
-      "#{shelly.shellyapp_url}/apps/#{code_name}/billing/edit"
+      "#{shelly.shellyapp_url}/organizations/#{attributes["organization_name"]}/edit"
     end
 
     def open
@@ -261,6 +261,22 @@ module Shelly
       cloud_databases - ['redis']
     end
 
+    # Public: Return true when app has been deployed
+    # false otherwise
+    def deployed?
+      git_info["deployed_commit_sha"].present?
+    end
+
+    # Public: Return list of not deployed commits
+    # Returns: A list of commits as a String with new line chars
+    # format: "#{short SHA} #{commit message} (#{time, ago notation})"
+    def pending_commits
+      current_commit = IO.popen("git rev-parse 'HEAD'").read.strip
+      format = "%C(yellow)%h%Creset %s %C(red)(%cr)%Creset"
+      range = "#{git_info["deployed_commit_sha"]}..#{current_commit}"
+      IO.popen(%Q{git log --no-merges --oneline --pretty=format:"#{format}" #{range}}).read.strip
+    end
+
     private
 
     # Internal: Checks if specified option is present in Cloudfile

data/lib/shelly/cli/deploy.rb

@@ -8,6 +8,7 @@ module Shelly
       include Helpers
 
       before_hook :logged_in?, :only => [:list, :show]
+      before_hook :inside_git_repository?, :only => [:pending]
       class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
       desc "list", "Lists deploy logs"
@@ -56,6 +57,22 @@ module Shelly
         say_error "Log not found, list all deploy logs using `shelly deploys list --cloud=#{app.code_name}`"
       end
 
+      desc "pending", "Show commits which haven't been deployed yet"
+      def pending
+        app = multiple_clouds(options[:cloud], "deploy pending")
+        if app.deployed?
+          commits = app.pending_commits
+          if commits.present?
+            say "Commits which are not deployed to Shelly"
+            say commits
+          else
+            say "All changes are deployed to Shelly", :green
+          end
+        else
+          say_error "No commits to show. Application hasn't been deployed yet"
+        end
+      end
+
       no_tasks do
         def specify_log(log)
           unless log

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.38"
+  VERSION = "0.1.39"
 end

data/spec/shelly/app_spec.rb

@@ -328,7 +328,8 @@ describe Shelly::App do
 
   describe "#edit_billing_url" do
     it "should return link to edit billing page for app" do
-      @app.edit_billing_url.should == "http://shellyapp.example.com/apps/foo-staging/billing/edit"
+      @app.stub(:attributes).and_return({"organization_name" => "example"})
+      @app.edit_billing_url.should == "http://shellyapp.example.com/organizations/example/edit"
     end
   end
 
@@ -447,4 +448,25 @@ describe Shelly::App do
       out.should == "GET / 127.0.0.1"
     end
   end
+
+  describe "#deployed?" do
+    it "should return true when app has been deployed" do
+      @app.stub(:attributes => {"git_info" => {"deployed_commit_sha" => "d1b8bec"}})
+      @app.should be_deployed
+    end
+
+    it "should return false when app hasn't been deployed yet" do
+      @app.stub(:attributes => {"git_info" => {"deployed_commit_sha" => ""}})
+      @app.should_not be_deployed
+    end
+  end
+
+  describe "#pending_commits" do
+    it "should return list of not deployed commits" do
+      IO.stub_chain(:popen, :read => "c10c5f6\n")
+      IO.should_receive(:popen).with(%Q{git log --no-merges --oneline --pretty=format:\"%C(yellow)%h%Creset %s %C(red)(%cr)%Creset\" c213697..c10c5f6}).and_return(mock(:read => "c10c5f6 Some changes\n"))
+      @app.stub(:attributes => {"git_info" => {"deployed_commit_sha" => "c213697"}})
+      @app.pending_commits.should == "c10c5f6 Some changes"
+    end
+  end
 end

data/spec/shelly/cli/deploy_spec.rb

@@ -103,7 +103,43 @@ describe Shelly::CLI::Deploy do
         "whenever" => "Looking up schedule.rb", "thin_restart" => "thins up and running",
         "delayed_job" => "delayed jobs", "callbacks" => "rake db:migrate"}
     end
-
   end
 
+  describe "#pending" do
+    before do
+      @app.stub(:deployed? => true)
+      @deploys.stub(:multiple_clouds => @app)
+    end
+
+    it "should ensure that user is inside git repo" do
+      hooks(@deploys, :pending).should include(:inside_git_repository?)
+    end
+
+    context "when application has been deployed" do
+      context "and has pending commits to deploy" do
+        it "should display them" do
+          text = "643124c Something (2 days ago)\nd1b8bec Something new (10 days ago)"
+          $stdout.should_receive(:puts).with(text)
+          @app.stub(:pending_commits => text)
+          invoke(@deploys, :pending)
+        end
+      end
+
+      context "and doesn't have pending commits to deploy" do
+        it "should display a message that everything is deployed" do
+          $stdout.should_receive(:puts).with(green "All changes are deployed to Shelly")
+          @app.stub(:pending_commits => "")
+          invoke(@deploys, :pending)
+        end
+      end
+    end
+
+    context "when application hasn't been deployed" do
+      it "should display error" do
+        @app.stub(:deployed? => false)
+        $stdout.should_receive(:puts).with(red "No commits to show. Application hasn't been deployed yet")
+        lambda { invoke(@deploys, :pending) }.should raise_error(SystemExit)
+      end
+    end
+  end
 end

data/spec/shelly/cli/main_spec.rb

@@ -411,13 +411,13 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     it "should create the app on shelly cloud and show trial information" do
-      @app.stub(:attributes).and_return({"trial" => true, "credit" => 40})
+      @app.stub(:attributes).and_return({"trial" => true, "credit" => 40, "organization_name" => "example"})
       @client.stub(:shellyapp_url).and_return("http://example.com")
       @app.should_receive(:create)
       $stdout.should_receive(:puts).with(green "Billing information")
       $stdout.should_receive(:puts).with("Cloud created with 40 Euro credit.")
       $stdout.should_receive(:puts).with("Remember to provide billing details before trial ends.")
-      $stdout.should_receive(:puts).with("http://example.com/apps/foo-staging/billing/edit")
+      $stdout.should_receive(:puts).with("http://example.com/organizations/example/edit")
 
       fake_stdin(["", ""]) do
         invoke(@main, :add)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 385526009396201718
+      hash: -285970216853493916
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 385526009396201718
+      hash: -285970216853493916
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.24