depl 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91ac5f8b6e1641069cd6a13f1c322258608ae9c5
-  data.tar.gz: 5d9b408b01a443bb0732c1577144e5dab7ef83b9
+  metadata.gz: b4eff59033859fce127ee93cf953d43e210b340a
+  data.tar.gz: 9782ae13f49e5d3da1eb6a6c54f4db759fcb535e
 SHA512:
-  metadata.gz: 9d139d3d2e13866bc0c6e22a9f1ff5e0a2755a41a8e44636d5d2c7861dd10d40d9731dc923749a29c5b0b522f4bac1d3c2aba41912df62bce8efd9a9531c9fc4
-  data.tar.gz: 56bef652df3802176b569df9602a3fe032e52e46ce881a24c43ef5c145fcebdec510027d9f04b142dcafa37a763a959d8cff6616adff2c3a7d305aebf5503ea1
+  metadata.gz: 4e596864ffcc42fb63728175e2f1d1021ecbfc8c83934590d890fe7a11bc9334c9fd20903419225001dcb45af54d6a22c8e88cba6e959af481246811e40ff712
+  data.tar.gz: 51d1ff3eb63e8391b482ca787c97f5aa02ab8b42b7a92c061f15e11e9da0174a0b292e7ad498a077d98e9c78d5d19ed4fc90bea09cdefd6d8dcb3afb31d030ab

data/README.md

@@ -27,6 +27,7 @@ Movable Ink uses Chef to push out new code, and Chef is set up to use environmen
 
 ## History
 
+* _0.0.4_ - Add --force and --quiet options; better help messages.
 * _0.0.3_ - Fixed yaml dependency.
 * _0.0.2_ - Updated gem description.
 * _0.0.1_ - Forked from deploy_s3; initial release.

data/bin/depl

@@ -13,7 +13,7 @@ require 'colorize'
 
 options = {}
 
-options[:environment] = ARGV.shift
+options[:environment] = ARGV.reject{|a| a =~ /^-/}.first
 
 options[:rev] = ENV['REV']
 
@@ -27,8 +27,29 @@ optparse = OptionParser.new do |opts|
   opts.on("-r", "--revision=REVISION", String, "Revision to deploy (can be sha, branch, etc)") do |r|
     options[:rev] = r
   end
+
+  opts.on("-f", "--force", "Do not ask for confirmation") do |f|
+    options[:force] = f
+  end
+
+  opts.on("-q", "--quiet", "No stdout output (only use with --force)") do |q|
+    options[:quiet] = q
+  end
+
+  opts.on("-h", "--help", "Print this help information") do |h|
+    if h
+      puts optparse
+      exit 1
+    end
+  end
+end
+begin
+  optparse.parse!
+rescue OptionParser::InvalidOption => e
+  puts e.message
+  puts optparse
+  exit 1
 end
-optparse.parse!
 
 unless options[:environment]
   puts "Error: environment required"
@@ -36,54 +57,68 @@ unless options[:environment]
   exit 1
 end
 
+def output(*msg)
+  puts *msg
+end
+
+if options[:force] and options[:quiet]
+  def output(*msg)
+    # no-op
+  end
+end
+
 deploy = Depl::Main.new(options)
 
 if deploy.up_to_date
-  puts "Everything up-to-date (#{deploy.environment.green}: #{deploy.remote_sha.green})"
+  output "Everything up-to-date (#{deploy.environment.green}: #{deploy.remote_sha.green})"
   exit 0
 end
 
 if deploy.remote_sha.nil?
-  puts "New deployment: #{deploy.local_sha}"
+  output "New deployment: #{deploy.local_sha}"
 else
-  puts "Attempting to deploy #{deploy.local_sha.bold}", ""
+  output "Attempting to deploy #{deploy.local_sha.bold}", ""
 
   commits = "#{deploy.commit_count} new commit(s)".green
-  puts "Difference of #{commits} between #{deploy.remote_sha} and #{deploy.local_sha}:", ""
+  output "Difference of #{commits} between #{deploy.remote_sha} and #{deploy.local_sha}:", ""
 
   if deploy.commit_count > 0
-    puts deploy.diff.yellow, ""
+    output deploy.diff.yellow, ""
   else
-    puts "    There are no new commits.", ""
+    output "    There are no new commits.", ""
   end
 end
 
 if deploy.older_local_sha
-  puts "WARNING: The commit you are deploying is older than what is currently on #{deploy.environment}. Missing commits: ".bold, ""
-  puts deploy.reverse_diff.red
-  puts ""
+  output "WARNING: The commit you are deploying is older than what is currently on #{deploy.environment}. Missing commits: ".bold, ""
+  output deploy.reverse_diff.red
+  output ""
 end
 
-confirm = ask("Deploy #{deploy.environment}? ([y]es / [n]o / [g]ithub) : ") { |yn| yn.limit = 1, yn.validate = /([yng]|yes|no|github)/i }
+if options[:force]
+  confirm = 'yes'
+else
+  confirm = ask("Deploy #{deploy.environment}? ([y]es / [n]o / [g]ithub) : ") { |yn| yn.limit = 1, yn.validate = /([yng]|yes|no|github)/i }
+end
 
 case confirm.downcase
 when 'y', 'yes'
   deploy.run!
 
-  puts "Deployed #{deploy.remote_sha}"
+  output "Deployed #{deploy.remote_sha}"
 when 'g', 'github'
   url = Depl::Remote.comparison(deploy.remote_sha, deploy.local_sha)
   if url
     if `which open`.size > 0
       `open #{url}`
     else
-      puts "  Github: #{url}"
+      output "  Github: #{url}"
     end
   else
-    puts "Unrecognized repository; can't open github"
-    puts "(try `git config --get remote.origin.url`)"
+    output "Unrecognized repository; can't open github"
+    output "(try `git config --get remote.origin.url`)"
     exit 1
   end
 when 'n', 'no'
-  puts "Bye."
+  output "Bye."
 end

data/lib/depl/version.rb

@@ -1,3 +1,3 @@
 module Depl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Nutt