shaddox 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd2053bd4b96c878ec2a985ec69c070000daf70b
-  data.tar.gz: ad6830dd32303cc0abdc47a1334db3cd587057d8
+  metadata.gz: 813bb3d6c4b67ca709df3d036a384bf199aefa52
+  data.tar.gz: a617115881d1381e3372ef9a89ea1d7121c1a4a6
 SHA512:
-  metadata.gz: d892245b6b72a1d1b786719e880e1f082dda64a63894409bd992b854df29b9e2db79fd05a5c9a29c6fb157903d0892fe40c2c078561532fda304c423f0350c18
-  data.tar.gz: ba99b2f0f588111af0387c46f57914539983f2b1e05e9152a741214fb523ac628fd71e3974436c4289861e56cfa11114c900b2f02a366f2de8405f3f67786f82
+  metadata.gz: a4a489561e4d86603b029847ef8d7e521d7aeeb14f85bb8a82b863ccb1edadec3586f3d0171204fcb6507b8be879a4a00f2c5041cbd7462b2a62e7d75291637c
+  data.tar.gz: a165f5393a606968f1ebd1538182100678d2865a3aca41483971029a8861dbe9f917582c7ccc517539cc7938f6a1d076b13314938d6cacc1891ae91d120160ab

data/Doxfile

@@ -9,7 +9,8 @@ server :vagrant, {
 }
 
 repo :profile, {
-	:url => "https://github.com/joshglendenning/profile.git"
+	:url => "https://github.com/joshglendenning/profile.git",
+	:shared => 'tmp'
 }
 
 task :foo do

data/bin/shaddox

@@ -12,8 +12,8 @@ OptionParser.new do |opts|
 
 	opts.banner = "Usage: shaddox [task] [target] [options]"
 
-	opts.on("-v", "--[no]-verbose", "Run verbosely") do |v|
-		options[:verbose] = v
+	opts.on("--debug", "Run verbosely") do |v|
+		options[:debug] = v
 	end
 
 	opts.on("--force", "Override lock on target") do |b|

data/lib/shaddox/config.rb

@@ -39,6 +39,7 @@ module Shaddox
 				begin
 					script_opts = {}
 					script_opts[:installer] = target.installer if target.respond_to? :installer
+					script_opts[:debug] = opts[:debug] if opts[:debug]
 					script = ShadowScript.new(self, task_key, script_opts)
 					target.deploy(script, opts)
 					info "Provisioning on :#{target_key} complete.".green

data/lib/shaddox/repo.rb

@@ -6,6 +6,7 @@ module Shaddox
 			@url = info[:url]
 			@branch = info[:branch] || 'master'
 			@vcs = info[:vcs] || :git
+			@shared = [info[:shared]].flatten || []
 		end
 
 		def to_source

data/lib/shaddox/shadow.rb

@@ -10,7 +10,7 @@ module Shaddox
 		require 'fileutils'
 		#include FileUtils
 		def initialize(options, &block)
-			@verbose = options[:verbose] || true
+			@debug = options[:debug] || false
 			@installer = options[:installer]
 			@tmppath = options[:tmppath] || '/tmp/shaddox/'
 			@required = true
@@ -26,8 +26,12 @@ module Shaddox
 		def sh(command, args = nil)
 			line = "#{command}"
 			line += " #{args.join(" ")}" if args
-			info "Running '#{line}' in '#{Dir.pwd}'", 1 if @verbose
-			system(command, *args)
+			exec(line, :verbose => true)
+		end
+
+		def exec(command, opts = {:verbose => false})
+			info "Running '#{command}' in '#{Dir.pwd}'", 1 if opts[:verbose] or @debug
+			system(command)
 			raise "#{line} failed" unless $? == 0 or !@required
 		end
 
@@ -94,20 +98,27 @@ module Shaddox
 
 				# Make a new release dir
 				release_path = "./releases/#{release}"
-				mkdir(release_path)
 
 				case repo.vcs
 				when :git
 					# Clone/update repo in vcs:
 					if exists_d('vcs')
 						cd 'vcs' do
-							sh "git fetch #{repo.url} #{repo.branch}:#{repo.branch} --force"
+							exec "git fetch #{repo.url} #{repo.branch}:#{repo.branch} --force"
 						end
 					else
-						sh "git clone #{repo.url} vcs --bare"
+						exec "git clone #{repo.url} vcs --bare"
 					end
-					sh "git clone ./vcs #{release_path} --recursive --branch #{repo.branch}"
+					exec "git clone ./vcs #{release_path} --recursive --branch #{repo.branch}"
 				end
+
+				# Link shared paths
+				repo.shared.each do |shared_path|
+					ln_s "./shared/#{shared_path}", "#{release_path}/#{shared_path}"
+				end
+
+				# Link ./current to the latest release
+				ln_s './current', release_path
 			end
 		end
 
@@ -131,9 +142,9 @@ module Shaddox
 			unless package_installed.call()
 				case @installer
 				when :apt
-					sh "sudo apt-get install -y #{package}"
+					exec "sudo apt-get install -y #{package}"
 				when :brew
-					sh "brew install #{package}"
+					exec "brew install #{package}"
 				end
 			end
 			raise "#{package} could not be installed." unless package_installed.call()

data/lib/shaddox/shadow_script.rb

@@ -4,15 +4,18 @@ module Shaddox
 		def initialize(config, task_key, opts = {})
 			# Initialize properties
 			@installer = opts[:installer]
+
 			@config = config
 			@cast_tasks = []
 
 			# Generate script
-			params = "{}"
-			params = "{:installer => :#{@installer}}" if @installer
+			params = []
+			params += ":installer => :#{@installer}" if @installer
+			params += ":debug => :#{opts[:debug]}" if opts[:debug]
+
 			@script = %Q{
 require 'shaddox'
-Shaddox::Shadow.new(#{params}) do
+Shaddox::Shadow.new({#{params.join(',')}}) do
 	## begin generated shadow ##
 			}
 			add_repos

data/lib/shaddox/target.rb

@@ -35,12 +35,12 @@ module Shaddox
 					shaddox_installed = lambda { exec 'gem list shaddox -i >/dev/null' }
 					if shaddox_installed.call()
 						info "Updating shaddox...", 1
-						updated = exec "gem update shaddox", :quiet => true
+						updated = exec "gem update shaddox", :verbose => false
 						updated = exec "sudo gem update shaddox" unless updated
 						warn "Shaddox could not be automatically updated. Please update it manually with 'gem update shaddox'.", 1 unless updated
 					else
 						info "Installing shaddox...", 1
-						installed = exec "gem install shaddox", :quiet => true
+						installed = exec "gem install shaddox", :verbose => false
 						installed = exec "sudo gem install shaddox" unless installed
 						warn "Shaddox could not be automatically installed. Please update it manually with 'gem update shaddox'.", 1 unless installed
 					end
@@ -120,7 +120,7 @@ module Shaddox
 					super(&block)
 				end
 			end
-			def exec(command, opts = {})
+			def exec(command, opts = {:verbose => true})
 				require 'highline/import'
 				exit_code = nil
 				@ssh.open_channel do |channel|
@@ -134,7 +134,7 @@ module Shaddox
 								pass = ask("") { |q| q.echo = false }
 								channel.send_data "#{pass}\n"
 							else
-								$stdout.print data unless opts[:quiet]
+								$stdout.print data if opts[:verbose]
 							end
 						end
 						channel.on_request('exit-status') do |ch, data|

data/lib/shaddox/version.rb

@@ -1,3 +1,3 @@
 module Shaddox
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

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