shelly 0.2.21 → 0.2.22

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.22 / 2013-05-20
+
+* [improvement] default application name is created without -staging/-production suffix
+* [improvement] git remote created after `shelly add` and `shelly setup` is named 'shelly'
+
 ## 0.2.21 / 2013-05-13
 
 * [improvement] require 'puma' or 'thin' gems if present in Cloudfile when running `shelly check`

data/lib/shelly/app.rb

@@ -40,24 +40,24 @@ module Shelly
     end
 
     def add_git_remote
-      system("git remote rm #{code_name} > /dev/null 2>&1")
-      system("git remote add #{code_name} #{git_url}")
+      system("git remote rm shelly > /dev/null 2>&1")
+      system("git remote add shelly #{git_url}")
     end
 
     def git_remote_exist?
-      IO.popen("git remote").read.include?(code_name)
+      IO.popen("git remote").read.include?('shelly')
     end
 
     def git_fetch_remote
-      system("git fetch #{code_name} > /dev/null 2>&1")
+      system("git fetch shelly > /dev/null 2>&1")
     end
 
     def git_add_tracking_branch
-      system("git checkout -b #{code_name} --track #{code_name}/master > /dev/null 2>&1")
+      system("git checkout -b shelly --track shelly/master > /dev/null 2>&1")
     end
 
     def remove_git_remote
-      system("git remote rm #{code_name} > /dev/null 2>&1")
+      system("git remote rm shelly > /dev/null 2>&1")
     end
 
     def create
@@ -147,21 +147,8 @@ module Shelly
       shelly.deployment(code_name, deployment_id)
     end
 
-    def self.guess_code_name
-      guessed = nil
-      cloudfile = Cloudfile.new
-      if cloudfile.present?
-        clouds = cloudfile.clouds.map(&:code_name)
-        if clouds.grep(/staging/).present?
-          guessed = "production"
-          production_clouds = clouds.grep(/production/)
-          production_clouds.sort.each do  |cloud|
-            cloud =~ /production(\d*)/
-            guessed = "production#{$1.to_i+1}"
-          end
-        end
-      end
-      "#{File.basename(Dir.pwd)}-#{guessed || 'staging'}".downcase.dasherize
+    def self.code_name_from_dir_name
+      "#{File.basename(Dir.pwd)}".downcase.dasherize
     end
 
     def configs

data/lib/shelly/cli/main.rb

@@ -108,16 +108,11 @@ module Shelly
         app.zone_name = options["zone"]
         app.create
 
-        if overwrite_remote?(app)
-          say "Adding remote #{app} #{app.git_url}", :green
-          app.add_git_remote
-        else
-          say "You have to manually add git remote:"
-          say "`git remote add NAME #{app.git_url}`"
-        end
+        git_remote = add_remote(app)
 
         say "Creating Cloudfile", :green
         app.create_cloudfile
+
         if app.credit > 0 || !app.organization_details_present?
           say_new_line
           say "Billing information", :green
@@ -131,7 +126,7 @@ module Shelly
         end
 
         info_adding_cloudfile_to_repository
-        info_deploying_to_shellycloud(app)
+        info_deploying_to_shellycloud(git_remote)
 
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
@@ -242,17 +237,17 @@ Wait until cloud is in 'turned off' state and try again.}
         say "Setting up #{app} cloud", :green
         app.git_url = app.attributes["git_info"]["repository_url"]
         if overwrite_remote?(app)
-          say "git remote add #{app} #{app.git_url}"
+          say "git remote add shelly #{app.git_url}"
           app.add_git_remote
-          say "git fetch #{app}"
+          say "git fetch shelly"
           app.git_fetch_remote
-          say "git checkout -b #{app} --track #{app}/master"
+          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 #{app} #{app.git_url}`"
-          say "`git fetch production`"
-          say "`git checkout -b #{app} --track #{app}/master`"
+          say "`git remote add shelly #{app.git_url}`"
+          say "`git fetch shelly`"
+          say "`git checkout -b shelly --track shelly/master`"
         end
 
         say_new_line
@@ -561,7 +556,19 @@ Wait until cloud is in 'turned off' state and try again.}
 
         def overwrite_remote?(app)
           git_remote = app.git_remote_exist?
-          !git_remote or (git_remote and yes?("Git remote #{app} exists, overwrite (yes/no): "))
+          !git_remote or (git_remote and yes?("Git remote shelly exists, overwrite (yes/no): "))
+        end
+
+        def add_remote(app)
+          if overwrite_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"
+          end
         end
 
         def ask_for_password(options = {})
@@ -584,8 +591,8 @@ Wait until cloud is in 'turned off' state and try again.}
         end
 
         def ask_for_code_name
-          default_code_name = Shelly::App.guess_code_name
-          code_name = ask("Cloud code name (#{Shelly::App.guess_code_name} - default):")
+          default_code_name = Shelly::App.code_name_from_dir_name
+          code_name = ask("Cloud code name (#{Shelly::App.code_name_from_dir_name} - default):")
           code_name.blank? ? default_code_name : code_name
         end
 
@@ -637,7 +644,7 @@ Wait until cloud is in 'turned off' state and try again.}
           say "  git status"
         end
 
-        def info_deploying_to_shellycloud(remote)
+        def info_deploying_to_shellycloud(remote = 'shelly')
           say_new_line
           say "When you make sure all settings are correct please issue following commands:", :green
           say "  git add ."

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -10,33 +10,10 @@ describe Shelly::App do
     @app = Shelly::App.new('foo-staging')
   end
 
-  describe ".guess_code_name" do
+  describe ".code_name_from_dir_name" do
     it "should downcase and dasherize code name" do
       Dir.stub(:pwd).and_return("/project/FOO")
-      Shelly::App.guess_code_name.should == "foo-staging"
-    end
-
-    context "no Cloudfile" do
-      it "should return name of current working directory" do
-        Shelly::App.guess_code_name.should == "foo-staging"
-      end
-    end
-
-    context "with Cloudfile" do
-      it "should return production" do
-        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
-        Shelly::App.guess_code_name.should == "foo-production"
-      end
-
-      it "should return production" do
-        File.open("Cloudfile", 'w') {|f| f.write("winnie-test:\n") }
-        Shelly::App.guess_code_name.should == "foo-staging"
-      end
-
-      it "should return productionNUMBER" do
-        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
-        Shelly::App.guess_code_name.should == "foo-production1"
-      end
+      Shelly::App.code_name_from_dir_name.should == "foo"
     end
   end
 
@@ -54,26 +31,26 @@ describe Shelly::App do
     end
 
     it "should try to remove existing git remote" do
-      @app.should_receive(:system).with("git remote rm foo-staging > /dev/null 2>&1")
+      @app.should_receive(:system).with("git remote rm shelly > /dev/null 2>&1")
       @app.add_git_remote
     end
 
     it "should add git remote with proper name and git repository" do
-      @app.should_receive(:system).with("git remote add foo-staging git@git.shellycloud.com:foo-staging.git")
+      @app.should_receive(:system).with("git remote add shelly git@git.shellycloud.com:foo-staging.git")
       @app.add_git_remote
     end
   end
 
   describe "git_fetch_remote" do
     it "should try to remove existing git remote" do
-      @app.should_receive(:system).with("git fetch foo-staging > /dev/null 2>&1")
+      @app.should_receive(:system).with("git fetch shelly > /dev/null 2>&1")
       @app.git_fetch_remote
     end
   end
 
   describe "git_add_tracking_branch" do
     it "should try to remove existing git remote" do
-      @app.should_receive(:system).with("git checkout -b foo-staging --track foo-staging/master > /dev/null 2>&1")
+      @app.should_receive(:system).with("git checkout -b shelly --track shelly/master > /dev/null 2>&1")
       @app.git_add_tracking_branch
     end
   end
@@ -81,7 +58,7 @@ describe Shelly::App do
 
   describe "git_remote_exist" do
     it "should return true if git remote exist" do
-      io = mock(:read => "origin\nfoo-staging")
+      io = mock(:read => "origin\nshelly")
       IO.should_receive(:popen).with("git remote").and_return(io)
       @app.git_remote_exist?.should be_true
     end

data/spec/shelly/cli/main_spec.rb

@@ -364,7 +364,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     it "should use code name provided by user" do
-      $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
+      $stdout.should_receive(:print).with("Cloud code name (foo - default): ")
       @app.should_receive(:code_name=).with("mycodename")
       fake_stdin(["mycodename", ""]) do
         invoke(@main, :add)
@@ -372,9 +372,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     context "when user provided empty code name" do
-      it "should use 'current_dirname-purpose' as default" do
-        $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
-        @app.should_receive(:code_name=).with("foo-staging")
+      it "should use 'current_dirname' as default" do
+        $stdout.should_receive(:print).with("Cloud code name (foo - default): ")
+        @app.should_receive(:code_name=).with("foo")
         fake_stdin(["", ""]) do
           invoke(@main, :add)
         end
@@ -462,7 +462,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
     context "git remote" do
       it "should add one if it doesn't exist" do
-        $stdout.should_receive(:puts).with("\e[32mAdding remote foooo git@git.shellycloud.com:foooo.git\e[0m")
+        $stdout.should_receive(:puts).with("\e[32mAdding remote shelly git@git.shellycloud.com:foooo.git\e[0m")
         @app.should_receive(:add_git_remote)
         fake_stdin(["foooo", ""]) do
           invoke(@main, :add)
@@ -475,8 +475,8 @@ 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 overwrite" do
-          $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no):  ")
-          $stdout.should_receive(:puts).with(green "Adding remote foooo git@git.shellycloud.com:foooo.git")
+          $stdout.should_receive(:print).with("Git remote shelly exists, overwrite (yes/no):  ")
+          $stdout.should_receive(:puts).with(green "Adding remote shelly git@git.shellycloud.com:foooo.git")
           @app.should_receive(:add_git_remote)
           fake_stdin(["foooo", "", "yes"]) do
             invoke(@main, :add)
@@ -484,9 +484,15 @@ 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
-          $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no):  ")
+          $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")
           @app.should_not_receive(:add_git_remote)
           fake_stdin(["foooo", "", "no"]) do
             invoke(@main, :add)
@@ -515,7 +521,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       $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 foooo master")
+      $stdout.should_receive(:puts).with("  git push shelly master")
       fake_stdin(["foooo", "none"]) do
         invoke(@main, :add)
       end
@@ -1067,9 +1073,9 @@ Wait until cloud is in 'turned off' state and try again.")
 
     it "should show info about adding remote and branch" do
       $stdout.should_receive(:puts).with(green "Setting up foo-staging cloud")
-      $stdout.should_receive(:puts).with("git remote add foo-staging git_url")
-      $stdout.should_receive(:puts).with("git fetch foo-staging")
-      $stdout.should_receive(:puts).with("git checkout -b foo-staging --track foo-staging/master")
+      $stdout.should_receive(:puts).with("git remote add shelly git_url")
+      $stdout.should_receive(:puts).with("git fetch shelly")
+      $stdout.should_receive(:puts).with("git checkout -b shelly --track shelly/master")
       $stdout.should_receive(:puts).with(green "Your application is set up.")
       invoke(@main, :setup)
     end

metadata

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

checksums.yaml

@@ -1,15 +0,0 @@
----
-!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=