shaddox 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad10618353ebf5c8b2d816503fca361c9b071d77
-  data.tar.gz: 79f59ddaf486890639d7e3c8b0dcd62cd545ae37
+  metadata.gz: 097f3c19422f16841c205ebcf8bb76edc942cac0
+  data.tar.gz: a2f083ebc2f357af97313c1d14dfc26cafa1d573
 SHA512:
-  metadata.gz: 9679130fb2b02ce4031b805d25f15f23c2bcf217285c879dcb472c7ea360178b80dba70049b0efb96c875b8eaba39eaf2efc15ed0a745fe72625cd247246c3cc
-  data.tar.gz: c78922762f9878d342232e74dbb575f7703e90c0eaacd6393338b8331ac014105714a76cf6612c220d4bea8eb1672f731b865654b1dbe3a5717560ec91303ace
+  metadata.gz: 669a9c59c491663797337731e8507744f4c67f6003899b9adb7f79100ecc3e18f3efe73b4eda9a5d704e68242abc7f918a230594f052488db333665f38abb4d3
+  data.tar.gz: 18681c874d14e3fe65a8566513726ae3599b20836444d4dfbb40c7bc7e69ce66b4ecb04261ee44dad401f1dba7e715542885d2fa665758cd656066cd6a16f78b

data/bin/shaddox

@@ -1,7 +1,46 @@
 #!/usr/bin/env ruby
 
 require 'shaddox'
+require 'optparse'
+
+@doxfile = './Doxfile'
+options = {
+	:verbose => true
+}
+
+OptionParser.new do |opts|
+
+	opts.banner = "Usage: shaddox [task] [target] [options]"
+
+	opts.on("-v", "--[no]-verbose", "Run verbosely") do |v|
+		options[:verbose] = v
+	end
+
+	opts.on("--force", "Override lock on target") do |force|
+		options[:force] = force
+	end
+
+	opts.on("--keep-tmp-dir", "Don't remove the tmpdir after deployment") do |force|
+		options[:force] = force
+	end
+
+	opts.on("--tmpdir PATH", "Specify the tmp directory to use (default '/tmp/shaddox')") do |dir|
+		options[:tmpdir] = dir
+	end
+
+	opts.on('-f PATH', '--doxfile', "Specify doxfile") do |f|
+		@doxfile = f
+	end
+
+	opts.on_tail("-h", "--help", "Show help text") do
+		puts opts
+		exit
+	end
+
+end.parse!
+
 task = ARGV[0]
 target = ARGV[1] || 'localhost'
-config = Shaddox::Config.new
-config.invoke(task.to_sym, target.to_sym)
+
+config = Shaddox::Config.new(@doxfile)
+config.invoke(task.to_sym, target.to_sym, options)

data/lib/shaddox/config.rb

@@ -1,7 +1,8 @@
 module Shaddox
 	class Config
 		attr_accessor :servers, :targets, :repos, :tasks
-		def initialize(doxfilename = "./Doxfile")
+		def initialize(doxfile)
+			doxfile = './Doxfile' unless doxfile
 			if !File.exists?(doxfilename)
 				puts "Doxfile could not be found.".red
 				exit(1)
@@ -12,9 +13,11 @@ module Shaddox
 			@tasks = Hash.new
 			@repos = Hash.new
 
+			# :local and :localhost point to local by default
 			@targets[:localhost] = Localhost.new
+			@targets[:local] = :localhost
 
-			instance_eval(File.read(doxfilename), doxfilename)
+			instance_eval(File.read(doxfile), doxfile)
 		end
 
 		def explode_target(target_key)

data/lib/shaddox/version.rb

@@ -1,3 +1,3 @@
 module Shaddox
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaddox
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - joshglendenning