rigup 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 074cf53541cc8dda276109cd786eed5e4c013455
-  data.tar.gz: ba808e6dd94614a4f0cc179fe3dccd29f1c1f517
+  metadata.gz: 62efb1ff293f94f8729e1c494fc07e9cfc5d8c80
+  data.tar.gz: ead2e1620710ed87d57be6f7fe5edcf3e4a4f967
 SHA512:
-  metadata.gz: d9ab780149ca55a6dca8bf1067bd723c00c532219e39196bcd8b5429c556a0bbccb790230c504c5fad0d638db0eb773436853df67dd5738d5b55f91dbd774127
-  data.tar.gz: a28e3901c130731e5792aa0683d11ec45534bd39840f4e4883b3861a88c33b545418c8cd2a4f1e711bbadb12f493181fc0fb227347f2375ca2376176f1be3876
+  metadata.gz: f9d33144732cb205306bf335b484dce1b4f84b07dacacbbf979be5234c5d30282e55b4d83440ad8956edd8a99f141b9295c3acda0bcc7c117fd8523f08e70fbd
+  data.tar.gz: dcc9ed34920e9a6f8fb168e504feba5ce107994b09253fead2fa50760da6ab04165a98142468bda7ff8de7d56f91a5c28f7d6e56b198e49745a5ff49ccbad9aa

data/lib/rigup/cli.rb

@@ -121,7 +121,9 @@ module Rigup
 
 			def call_release_command(aCommand)
 				return unless cmdline = config["#{aCommand}_command".to_sym].to_s.strip.to_nil
-				run cmdline, @release_path
+				cd @release_path do
+					run cmdline
+				end
 			end
 
 		end
@@ -130,10 +132,13 @@ module Rigup
 
 		desc "new GIT_URL [PATH]", "setup new site"
 		def new(aGitUrl,aPath=nil)
-			aPath ||= File.basename(aGitUrl,'.git')
+			app_name = File.basename(aGitUrl,'.git')
+			aPath ||= app_name
 			init(
 				aPath,
-				git_url: aGitUrl
+				git_url: aGitUrl,
+				app_name: app_name,
+				user: ENV['USER']
 			)
 			FileUtils.mkdir_p(site_dir)
 			FileUtils.mkdir_p(File.join(site_dir,'releases'))

data/lib/rigup/config.rb

@@ -3,6 +3,9 @@ module Rigup
 	class Config < Buzztools::Config
 
 		DEFAULTS = {
+			app_name: String,
+			user: String,
+			group: 'www',
 			site_dir: String,
 			git_url: String,
 			branch: String,

data/lib/rigup/install_utils.rb

@@ -74,13 +74,12 @@ module Rigup
 			internal_permissions(aPath, aKind)
 		end
 
-		def ensure_link(aTo,aFrom) #,aDir=nil,aUserGroup=nil,aSudo='')
+		def ensure_link(aTo,aFrom,aUserGroup=nil,aSudo='')
 			raise "Must supply from" if !aFrom
 			cmd = []
-			#cmd << "cd #{aDir}" if aDir
-			cmd << "#{@context.sudo} rm -rf #{aFrom}"
-			cmd << "#{@context.sudo} ln -sf #{aTo} #{aFrom}"
-			#cmd << "#{@context.sudo} chown -h #{aUserGroup} #{aFrom}" if aUserGroup
+			cmd << "#{aSudo} rm -rf #{aFrom}"
+			cmd << "#{aSudo} ln -sf #{aTo} #{aFrom}"
+			cmd << "#{aSudo} chown -h #{aUserGroup} #{aFrom}" if aUserGroup
 			run cmd.join(' && ')
 		end
 

data/lib/rigup/runability.rb

@@ -1,11 +1,36 @@
 module Rigup
 	module Runability
 
-		def run(aCommand,aDir=nil)
+		def shell
+			@shell ||= ::Session::Bash.new
+		end
+
+		def pwd
+			shell.execute("pwd", stdout: nil).first.strip
+		end
+
+		def cd(aPath,&block)
+			if block_given?
+				begin
+			 		before_path = pwd
+					cd(aPath)
+					yield aPath,before_path
+				ensure
+					cd(before_path)
+				end
+			else
+				aPath = File.expand_path(aPath)
+				Dir.chdir(aPath)
+				shell.execute("cd \"#{aPath}\"")
+			end
+			aPath
+		end
+
+		def run(aCommand)
 			@context.logger.debug aCommand
-			response = ::POpen4::shell(aCommand,aDir || @context.pwd)
-			raise Error, "Command Failed" unless (response && response[:exitcode]==0)
-			return response[:stdout]
+			response,errout = @shell.execute(aCommand,stdout: STDOUT)  #   ::POpen4::shell(aCommand,aDir || @context.pwd)
+			raise Error, "Command Failed" unless @shell.exit_status==0
+			return response
 		end
 
 		def run_for_all(aCommand,aPath,aFilesOrDirs,aPattern=nil,aInvertPattern=false,aSudo=false)

data/lib/rigup/version.rb

@@ -1,3 +1,3 @@
 module Rigup
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rigup.rb

@@ -2,7 +2,8 @@ require 'thor'
 require 'buzztools'
 require 'logger'
 require 'yaml'
-require 'buzztools/extras/shell_extras'
+require 'session'
+#require 'buzztools/extras/shell_extras'
 
 require_relative "rigup/version"
 require_relative "rigup/config"

data/notes.txt

@@ -1,3 +1,52 @@
+https://github.com/ahoward/wrap
+
+https://github.com/ahoward/session/tree/master
+
+bash = Session::Bash.new
+
+execute command, collecting output AND piping to screen :
+out,err = bash.execute('some command',stdout: STDOUT)
+
+out,err = run(aCommand,aDir,)
+
+SOLUTION :
+
+create mixin including Session::Bash
+add cd method eg.
+cd(@release_path) do
+	run "do this"
+	run "do that"
+end
+OR
+cd(@release_path)
+(also does Dir.chdir for consistency with other Ruby methods)
+
+run_in "ls",@release_path
+
+run(aCommand,aOptions)
+run fires exception if exit_status not 0
+
+silent do		# disconnects stdout
+	run 'this'
+	run 'that'
+end
+
+pipe_out do	# sends all output to stdout
+	run 'this'
+end
+
+
+Output Idea :
+
+say "Get File Listing..."
+run "ls"
+
+Get File Listing...
+> ls
+				current  releases  rigup.yml  shared
+				this and that
+
+
 From site root :
 
 > cd /var/www

data/rigup.gemspec

@@ -36,7 +36,8 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency('git')
 	#s.add_runtime_dependency('middleman')
 	s.add_runtime_dependency('buzztools')
-	s.add_runtime_dependency('POpen4')
+	#s.add_runtime_dependency('POpen4')
+	s.add_runtime_dependency('session')
 	# https://github.com/geemus/formatador
 	#s.add_runtime_dependency('bitbucket_rest_api')
 	#s.add_runtime_dependency('osx_keychain')

data/rigup.iml

@@ -10,18 +10,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="POpen4 (v0.1.4, RVM: ruby-2.0.0-p247) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="Platform (v0.4.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.3, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="buzztools (v0.0.4, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="git (v1.2.6, RVM: ruby-2.0.0-p247) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="open4 (v1.3.3, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.2.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec (v2.14.1, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.14.8, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.14.5, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.14.6, RVM: ruby-2.0.0-p247) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="session (v3.2.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, RVM: ruby-2.0.0-p247) [gem]" level="application" />
   </component>
 </module>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rigup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: POpen4
+  name: session
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='