shelly 0.2.22 → 0.2.23

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWJjMDExOTYxYWQyZmIyODI5NDg0ZTZmZTBkZTFjMzc0NzdjMGU3ZQ==
+  data.tar.gz: !binary |-
+    ODAxNzQ5ZTAzMTRlMDk2OTZmYzMwZDgxN2Y3MGVhZThhMDIzN2I3Yw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTJkOGFmYTNmNGIwODljZGY4NTdiNzg4NWUxZDg0Y2YxYjc3YWRlYWQ4YTk3
+    M2EyYWM1MmQwOGVmNmIzODM1MTRlNDc1ZWUzNDQyODYyMWI4ZTdlN2ZiNjdm
+    MzZiMWQyOTJlYjQxYjZlMWI4YzQxZjJiMmRmODQ5OTljMjZiYjY=
+  data.tar.gz: !binary |-
+    YmVlMmYwZDBjZmM2YTQzMWQ2NDllMDdjM2ViMzUyZmJjMjdkNDA5ODUzNDdm
+    ZjY4YjhmZDlkNTE4NDU5ZDM4MjUwMzBhZDIxOWUzNTFiZjhmYTg0NjhhMjA2
+    M2UxNThiMTRjN2Y3MWE1NGE5MTU4YjEyZDBiN2RkNzViNTM2ZWU=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.23 / 2013-05-25
+
+* [bug] `shelly add` ask for existing organization if user owns at least one
+* [improvement] Ask for git remote name if default is already taken when adding or setting up cloud
+
 ## 0.2.22 / 2013-05-20
 
 * [improvement] default application name is created without -staging/-production suffix

data/lib/shelly/app.rb

@@ -39,21 +39,21 @@ module Shelly
       @databases = dbs - ['none']
     end
 
-    def add_git_remote
-      system("git remote rm shelly > /dev/null 2>&1")
-      system("git remote add shelly #{git_url}")
+    def add_git_remote(remote_name = 'shelly')
+      system("git remote rm #{remote_name} > /dev/null 2>&1")
+      system("git remote add #{remote_name} #{git_url}")
     end
 
-    def git_remote_exist?
-      IO.popen("git remote").read.include?('shelly')
+    def git_remote_exist?(remote_name = 'shelly')
+      IO.popen("git remote").read.include?(remote_name)
     end
 
-    def git_fetch_remote
-      system("git fetch shelly > /dev/null 2>&1")
+    def git_fetch_remote(remote = 'shelly')
+      system("git fetch #{remote} > /dev/null 2>&1")
     end
 
-    def git_add_tracking_branch
-      system("git checkout -b shelly --track shelly/master > /dev/null 2>&1")
+    def git_add_tracking_branch(remote = 'shelly')
+      system("git checkout -b #{remote} --track #{remote}/master > /dev/null 2>&1")
     end
 
     def remove_git_remote

data/lib/shelly/cli/main.rb

@@ -236,7 +236,7 @@ Wait until cloud is in 'turned off' state and try again.}
         app = multiple_clouds(options[:cloud], "setup")
         say "Setting up #{app} cloud", :green
         app.git_url = app.attributes["git_info"]["repository_url"]
-        if overwrite_remote?(app)
+        if overwrite_default_remote?(app)
           say "git remote add shelly #{app.git_url}"
           app.add_git_remote
           say "git fetch shelly"
@@ -244,10 +244,20 @@ Wait until cloud is in 'turned off' state and try again.}
           say "git checkout -b shelly --track shelly/master"
           app.git_add_tracking_branch
         else
-          say "You have to manually add remote:"
-          say "`git remote add shelly #{app.git_url}`"
-          say "`git fetch shelly`"
-          say "`git checkout -b shelly --track shelly/master`"
+          loop do
+            remote = ask('Specify remote name:')
+            if app.git_remote_exist?(remote)
+              say("Remote '#{remote}' already exists")
+            else
+              say "git remote add #{remote} #{app.git_url}"
+              app.add_git_remote(remote)
+              say "git fetch shelly"
+              app.git_fetch_remote(remote)
+              say "git checkout -b shelly --track shelly/master"
+              app.git_add_tracking_branch(remote)
+              return
+            end
+          end
         end
 
         say_new_line
@@ -554,21 +564,29 @@ Wait until cloud is in 'turned off' state and try again.}
           databases.all? { |kind| kinds.include?(kind) }
         end
 
-        def overwrite_remote?(app)
+        def overwrite_default_remote?(app)
           git_remote = app.git_remote_exist?
           !git_remote or (git_remote and yes?("Git remote shelly exists, overwrite (yes/no): "))
         end
 
         def add_remote(app)
-          if overwrite_remote?(app)
+          remote = if overwrite_default_remote?(app)
             say "Adding remote shelly #{app.git_url}", :green
-            app.add_git_remote
             "shelly"
           else
-            say "You have to manually add git remote:"
-            say "`git remote add NAME #{app.git_url}`"
-            "NAME"
+            loop do
+              remote = ask('Specify remote name:')
+              if app.git_remote_exist?(remote)
+                say("Remote '#{remote}' already exists")
+              else
+                say "Adding remote #{remote} #{app.git_url}", :green
+                return remote
+              end
+            end
           end
+
+          app.add_git_remote(remote)
+          remote
         end
 
         def ask_for_password(options = {})
@@ -611,7 +629,7 @@ Wait until cloud is in 'turned off' state and try again.}
 
         def ask_for_organization(default_name)
           organizations = Shelly::User.new.organizations
-          if organizations.count > 1
+          unless organizations.blank?
             count = organizations.count
             option_selected = 0
             loop do

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.22"
+  VERSION = "0.2.23"
 end

data/spec/shelly/cli/main_spec.rb

@@ -484,17 +484,14 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         end
 
         it "should ask if one exist and not overwrite" do
+          @app.stub(:git_remote_exist?).with('test').and_return(false)
           $stdout.should_receive(:print).with("Git remote shelly exists, overwrite (yes/no):  ")
-          $stdout.should_receive(:puts).with("You have to manually add git remote:")
-          $stdout.should_receive(:puts).with("`git remote add NAME git@git.shellycloud.com:foooo.git`")
-          $stdout.should_receive(:puts).with("\e[32mWhen you make sure all settings are correct please issue following commands:\e[0m")
-          $stdout.should_receive(:puts).with("  git add .")
-          $stdout.should_receive(:puts).with('  git commit -m "Application added to Shelly Cloud"')
-          $stdout.should_receive(:puts).with("  git push")
-          $stdout.should_receive(:puts).with("\e[32mDeploy to your cloud using:\e[0m")
-          $stdout.should_receive(:puts).with("  git push NAME master")
+          $stdout.should_receive(:print).with("Specify remote name: ")
+          $stdout.should_receive(:puts).with(green "Adding remote test git@git.shellycloud.com:foooo.git")
+          $stdout.should_receive(:puts).with("  git push test master")
+
           @app.should_not_receive(:add_git_remote)
-          fake_stdin(["foooo", "", "no"]) do
+          fake_stdin(["foooo", "", "no", "test"]) do
             invoke(@main, :add)
           end
         end
@@ -581,10 +578,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
       context "ask user for organization" do
         before do
-          @client.stub(:organizations).and_return([
-            {"name" => "aaa"},
-            {"name" => "ccc"}
-          ])
+          @client.stub(:organizations).and_return([{"name" => "aaa"}])
         end
 
         it "should ask user to choose organization if present and use chosen organization" do
@@ -592,9 +586,8 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
           $stdout.should_receive(:puts).with("Select organization for this cloud:")
           $stdout.should_receive(:puts).with("existing organizations:")
           $stdout.should_receive(:puts).with("  1) aaa")
-          $stdout.should_receive(:puts).with("  2) ccc")
           $stdout.should_receive(:puts).with("new organization (default as code name):")
-          $stdout.should_receive(:puts).with("  3) foooo")
+          $stdout.should_receive(:puts).with("  2) foooo")
           $stdout.should_receive(:print).with("Option: ")
           fake_stdin(["foooo", "none", "1"]) do
             invoke(@main, :add)
@@ -606,11 +599,10 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
           $stdout.should_receive(:puts).with("Select organization for this cloud:")
           $stdout.should_receive(:puts).with("existing organizations:")
           $stdout.should_receive(:puts).with("  1) aaa")
-          $stdout.should_receive(:puts).with("  2) ccc")
           $stdout.should_receive(:puts).with("new organization (default as code name):")
-          $stdout.should_receive(:puts).with("  3) foooo")
+          $stdout.should_receive(:puts).with("  2) foooo")
           $stdout.should_receive(:print).with("Option: ")
-          fake_stdin(["foooo", "none", "3"]) do
+          fake_stdin(["foooo", "none", "2"]) do
             invoke(@main, :add)
           end
         end
@@ -1113,10 +1105,12 @@ Wait until cloud is in 'turned off' state and try again.")
 
       context "and user answers no" do
         it "should display commands to perform manually" do
-          @app.should_not_receive(:add_git_remote)
-          @app.should_not_receive(:git_fetch_remote)
-          @app.should_not_receive(:git_add_tracking_branch)
-          fake_stdin(["no"]) do
+          @app.stub(:git_remote_exist?).with('remote').and_return(false)
+          $stdout.should_receive(:print).with("Specify remote name: ")
+          @app.should_receive(:add_git_remote).with('remote')
+          @app.should_receive(:git_fetch_remote).with('remote')
+          @app.should_receive(:git_add_tracking_branch).with('remote')
+          fake_stdin(["no", "remote"]) do
             invoke(@main, :setup)
           end
         end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.22
-  prerelease: 
+  version: 0.2.23
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-25 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,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,34 @@ dependencies:
   type: :development
   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
+    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: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +174,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +188,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +202,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -273,32 +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'
-      segments:
-      - 0
-      hash: -3704020040703191433
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3704020040703191433
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.24
+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