shelly 0.4.5 → 0.4.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9806b19fb3c19741be321f7b85b0b5907d6b397c
+  data.tar.gz: 60dc5f079fc9aa5d658232e1b5af5eb8a2cba919
+SHA512:
+  metadata.gz: 44b83e991d63f0b091d12c392c605170c80bb370f166e827c9d2605a35ba004ddc8dc94ff85862d021410608e51d6cbe5719ed5c66679835c4f7f5b7518db1c8
+  data.tar.gz: c7192c598ec6e85faafb4a7981c4d4c685f742f24738793ab7b528ed63730522af4fe150295ba16f5da13f1fdc1b6408b5c4fd942965a1368631c82b574f2bd1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.6 / 2013-10-01
+
+* [bugfix] `shelly delete` removes proper git remote.
+* [improvement] List all supported services in generated Cloudfile.
+
 ## 0.4.5 / 2013-09-24
 
 * [improvement] Print user-friendly message for bad .netrc file permission.

data/lib/shelly/app.rb

@@ -53,7 +53,16 @@ module Shelly
     end
 
     def remove_git_remote
-      system("git remote rm shelly > /dev/null 2>&1")
+      remote = git_remote_name
+      if remote.present?
+        system("git remote rm #{remote} > /dev/null 2>&1")
+      end
+    end
+
+    def git_remote_name
+      io = IO.popen("git remote -v").readlines
+      remote = io.select {|line| line.include? git_info["repository_url"]}.first
+      remote.split("\t").first unless remote.nil?
     end
 
     def create

data/lib/shelly/templates/Cloudfile.erb

@@ -19,8 +19,11 @@
       <%- if @puma -%>
       puma: <%= @puma %>
       <%- end -%>
-      # whenever: on
       # delayed_job: 1
+      # sidekiq: 1
+      # clockwork: on
+      # whenever: on
+      # elasticsearch: on
       databases:
         <%- if @databases.present? -%>
         <%- @databases.each do |kind| -%>

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/shelly/app_spec.rb

@@ -34,14 +34,14 @@ describe Shelly::App do
     end
   end
 
-  describe "git_fetch_remote" do
+  describe "#git_fetch_remote" do
     it "should try to remove existing git remote" do
       @app.should_receive(:system).with("git fetch shelly > /dev/null 2>&1")
       @app.git_fetch_remote
     end
   end
 
-  describe "git_remote_exist" do
+  describe "#git_remote_exist?" do
     it "should return true if git remote exist" do
       io = mock(:read => "origin\nshelly")
       IO.should_receive(:popen).with("git remote").and_return(io)
@@ -49,6 +49,51 @@ describe Shelly::App do
     end
   end
 
+  describe "#remove_git_remote" do
+    context "when git remote exist" do
+      it "should remove git remote" do
+        @app.should_receive(:system).with("git remote rm remote > /dev/null 2>&1")
+        @app.should_receive(:git_remote_name).and_return("remote")
+        @app.remove_git_remote
+      end
+    end
+
+    context "when git remote does not exist" do
+      it "should invoke git remote rm" do
+        @app.should_not_receive(:system)
+        @app.should_receive(:git_remote_name).and_return(nil)
+        @app.remove_git_remote
+      end
+    end
+  end
+
+  describe "#git_remote_name" do
+    before do
+      @client.stub(:app).
+        and_return("git_info" => {"repository_url" => "git_url"})
+    end
+
+    context "when remote exist" do
+      let(:io) { mock(:readlines => ["origin\turl\n",
+                                     "shelly\tgit_url\n"]) }
+
+      it "should return remote name" do
+        IO.should_receive(:popen).with("git remote -v").and_return(io)
+        @app.git_remote_name.should == "shelly"
+      end
+    end
+
+    context "when remote does not exist" do
+      let(:io) { mock(:readlines => ["origin\turl\n",
+                                     "shelly\turl\n"]) }
+
+      it "should return nil" do
+        IO.should_receive(:popen).with("git remote -v").and_return(io)
+        @app.git_remote_name.should be_nil
+      end
+    end
+  end
+
   describe "#configs" do
     it "should get configs from client" do
       @client.should_receive(:app_configs).with("foo-staging").and_return(config_response)

data/spec/shelly/cli/main_spec.rb

@@ -1150,6 +1150,7 @@ Wait until cloud is in 'turned off' state and try again.")
       @app.stub(:delete)
       Shelly::User.stub(:new).and_return(@user)
       Shelly::App.stub(:new).and_return(@app)
+      @client.stub(:app).and_return("git_info" => {"repository_url" => "git_url"})
     end
 
     it "should ensure user has logged in" do
@@ -1197,6 +1198,14 @@ Wait until cloud is in 'turned off' state and try again.")
           end
         }.should raise_error(SystemExit)
       end
+
+      it "should remove git remote" do
+        @app.should_receive(:remove_git_remote)
+        @main.options = {:cloud => "foo-staging"}
+        fake_stdin(["yes", "yes", "yes"]) do
+          invoke(@main, :delete)
+        end
+      end
     end
 
     context "when git repository doesn't exist" do

data/spec/shelly/cloudfile_spec.rb

@@ -120,8 +120,11 @@ foo-staging:
     app1:
       size: large
       thin: 4
-      # whenever: on
       # delayed_job: 1
+      # sidekiq: 1
+      # clockwork: on
+      # whenever: on
+      # elasticsearch: on
       databases:
         - postgresql
         - mongodb
@@ -149,8 +152,11 @@ foo-staging:
     app1:
       size: small
       thin: 2
-      # whenever: on
       # delayed_job: 1
+      # sidekiq: 1
+      # clockwork: on
+      # whenever: on
+      # elasticsearch: on
       databases:
         - postgresql
         - mongodb

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.5
-  prerelease: 
+  version: 0.4.6
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,103 +27,90 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: guard
   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'
 - !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'
 - !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'
 - !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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,81 +125,71 @@ dependencies:
 - !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'
 - !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'
 - !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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: netrc
   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'
 description: Tool for managing applications and clouds at shellycloud.com
@@ -310,32 +283,25 @@ files:
 homepage: http://shellycloud.com
 licenses:
 - MIT
+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'
-      segments:
-      - 0
-      hash: 74743708609339319
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 74743708609339319
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shelly Cloud command line tool
 test_files: []