gitscape 1.6.2 → 1.6.3

data/bin/gitscape

@@ -48,17 +48,9 @@ op = OptionParser.new do |op|
     options[:update_env] = bool
   end
 
-  op.on '-e=ENV', '--env-depth=ENV', [:staging, :qa, :live], 'The level of environments to push changes to' do |depth|
+  op.on '-e', '--env-depth=ENV', [:staging, :qa, :live], 'The level of environments to push changes to' do |depth|
     options[:env_depth] = depth
   end
-
-  op.on '--qa', 'Sets the environment depth for the command to qa.  This is equivalent to "--env-depth=qa".' do
-    options[:env_depth] = :qa
-  end
-
-  op.on '--live', 'Sets the environment depth for the command to live.  This is equivalent to "--env-depth=live".' do
-    options[:env_depth] = :live
-  end
 end
 
 op.parse!(ARGV)

data/lib/gitscape/base.rb

@@ -78,6 +78,9 @@ class Gitscape::Base
     # option defaults
     options[:push] = false if options[:push].nil?
     
+    # Check that the working copy is clean
+    exit 1 unless git_working_copy_is_clean
+    
     puts `git checkout live`
     puts `git pull origin`
 
@@ -99,6 +102,9 @@ class Gitscape::Base
     options[:push]        = true      if options[:push].nil?
     options[:update_env]  = false     if options[:update_env].nil?
 
+    # Check that the working copy is clean
+    exit 1 unless git_working_copy_is_clean
+
     usage_string = "expected usage: hotfix_finish [<hotfix_branch>]
     hotfix_branch: the name of the hotfix branch to finish.
       if ommitted, you must currently be on a hotfix branch"

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
 module Gitscape
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end

metadata

@@ -1,41 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gitscape
-version: !ruby/object:Gem::Version
-  version: 1.6.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 6
+  - 3
+  version: 1.6.3
 platform: ruby
-authors:
+authors: 
 - Jon Botelho
 - Xavier Matos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-10 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: git
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.5
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
+  type: :runtime
+  version_requirements: *id001
 description: Various Git utilities for cherry-pick/rebase workflows.
-email:
+email: 
 - gitscape@eachscape.com
-executables:
+executables: 
 - gitscape
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -45,28 +51,35 @@ files:
 - lib/gitscape.rb
 - lib/gitscape/base.rb
 - lib/gitscape/version.rb
+has_rdoc: true
 homepage: https://github.com/eachscape/gitscape
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Various Git utilities for cherry-pick/rebase workflows.
 test_files: []
+