cenvup 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3f4737ce3d91a3a8fac0134fa3e6f3f16194a2
-  data.tar.gz: 20043e08e98ec0644ae70fed777bc2d478c047fd
+  metadata.gz: 1345bdfc9a78a700f613b7521eb9cc51233ebf71
+  data.tar.gz: b980b684687c2743baa01db4a92bd720f4c8fa5b
 SHA512:
-  metadata.gz: d1b6405812b6bab382b0114976bbfc08eb932423f3dce7f27696afae5552a7194ec27d259b5a254386e1fb5eb1136faa57d9d567a0f8694edb5c54750ea137a0
-  data.tar.gz: 211dd9519d6838bb35e3052c2feaa537fb1f401fca092c791346cdf8168a73f422d2cc827cdc9112418875c3173a37ff778dabf67e8305fbe826da7b61fd6c70
+  metadata.gz: ad5ace66bd366b847be0974b8dce8e8005e1d860ef6b445d9c2f05f936e6f671bdc00012b8e980b494e1e2ecb8425990682c405262763b3f6d4c39e864cc0c33
+  data.tar.gz: 0f48c374a4bad54dbd2ca5dff7d7395a65071fd0ead2326b6395189e533c9352b1264d11c6d93ff64e30d326185cbc01b0c376eb68fb3067136fde59a0a2b1a2

data/README.md

@@ -33,7 +33,7 @@ cenvup list
 Should give you which environment you can use, then upload it with this command (without the file extension)
 
 ```bash
-cenvup from_file <environment>
+cenvup <environment>
 ```
 
 ## Configuration
@@ -62,7 +62,7 @@ def help_me
   puts 'Usage: cenvup (option)'
   puts ''
   puts 'Available options:'
-  puts '  from_file <ENV>   Upload <ENV> to chef server'
+  puts '  <ENV>             Upload <ENV> to chef server'
   puts '  locate_kitchen    Do a lookup for Kitchen from $HOME'
   puts '  help              This friendly help message'
   puts '  list              List available environments'

data/lib/cenvup/cli.rb

@@ -5,7 +5,6 @@ module Cenvup
 
       help_me if ARGV.count == 0
       help_me if ARGV[0] =~ /^(-h|--help|help)$/
-      help_me unless ARGV[0] =~ /^(from_file|list)$/
       run
     end
 
@@ -189,8 +188,14 @@ module Cenvup
           prompt = ask('Do you want to proceed? (y/n)'.green)
           case prompt
           when "y"
-            puts "Uploading #{file_name} to #{chef_server_url}".gsub("\#{org_name}", org_name[1..-2]).green
-            puts `(cd #{config['environments_path']} && #{cmd})`.green
+            if verify_kitchen_branch_status?(config['environments_path'])
+              puts "Validated that no update where performed.".green
+              puts "Uploading #{file_name} to #{chef_server_url}".gsub("\#{org_name}", org_name[1..-2]).green
+              puts `(cd #{config['environments_path']} && #{cmd})`.green
+            else
+              puts "Aborting, someone reuploaded meanwhile you where busy accepting!".red
+              exit 1
+            end
           when "n"
             puts "Cancelling.".red
             exit 1
@@ -208,15 +213,13 @@ module Cenvup
       config_check(@conf)
 
       case ARGV[0]
-      when 'from_file'
-        from_file(ARGV[1])
       when 'locate_kitchen'
         puts "WIP"
         # locate_kitchen
       when 'list'
         list_environments
       else
-        exit 1
+        from_file(ARGV[0])
       end
     end
 
@@ -224,7 +227,7 @@ module Cenvup
       puts 'Usage: cenvup (option)'
       puts ''
       puts 'Available options:'
-      puts '  from_file <ENV>   Upload <ENV> to chef server'
+      puts '  <ENV>             Upload <ENV> to chef server'
       puts '  locate_kitchen    Do a lookup for Kitchen from $HOME'
       puts '  help              This friendly help message'
       puts '  list              List available environments'

data/lib/cenvup/version.rb

@@ -1,3 +1,3 @@
 module Cenvup
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cenvup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yann David (Typositoire)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   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: rake
   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: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: " Cenvup is used to upload Chef Environment to Chef Server.\n                           This
@@ -90,7 +90,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,19 +110,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Cenvup is used to upload Chef Environment to Chef Server.
 test_files: []
-has_rdoc: