pjam 0.1.0 → 0.1.3

data/bin/pjam

@@ -8,37 +8,108 @@ include Term::ANSIColor
 
 opts = Trollop::options do
 
-  version "pjam 0.0.1 (c) 2013 Alexey Melezhik / melezhik@gmail.com"
+  version "pjam 0.1.3 (c) 2013 Alexey Melezhik / melezhik@gmail.com"
   banner <<-EOS
-smart glue between pinto and your scm.
+Pjam is a tool which enables automatic creation of perl applications distribution archives from source code using pinto
 
 Usage:
        pjam [options]
 where [options] are:
 EOS
 
-    opt :p, "path to project", :type => :string
+    opt :p, "path to project root directory", :type => :string
+    opt :wd, "add dependencies for development", :default => false	
+    opt :c, "path to pjam configuration file, should be relative to project root directory", :type => :string	
     opt :skip_pinto, "skip pinto phase, only do distibution phase", :default => false
-    opt :no_color, "do not colour output", :default => false
+    opt :update, "update distibution archive if it alerady exists in repository", :default => true
+    opt :dry_run, "run in dry-run mode; only upcoming changes will be shown, no action will be taken", :default => false
+    opt :no_color, "disable colour output", :default => false
     opt :no_misc, "do not add miscellaneous prerequisites", :default => false
     opt :only, "only add given source(s). multiple sources are separated by comma", :type => :string, :default => nil
     opt :only_pinto, "only do pinto phase, skip distribution phase", :default => false
+    opt :env, "set environmental varibales. use format env='a=1 b=2 c=3'", :type => :string, :default => nil
+
 end
 
 version_postfix = `date +-rev-%Y-%B-%d-%H-%M`.chomp!
 
+if opts[:p].nil?
+	project_id = Dir.pwd
+else
+	project_id = "#{Dir.pwd}/#{opts[:p]}"
+end
+
+wd_flag = ( opts[:wd] == true ) ? "--wd" : ""
+
+local_lib = "#{project_id}/cpanlib"
+
+if ((opts.has_key? :c) and (! opts[:c].nil? ))
+	config_path = "#{project_id}/#{opts[:c]}"
+else
+	config_path = "#{project_id}/pjam.json"
+end
+
+env_string_arr =  ['export PINTO_DEBUG=0']
+
+unless opts[:env].nil?
+	opts[:env].split(' ').each do |ch|
+		env_string_arr << "export #{ch}"
+	end
+end
+
+env_string = env_string_arr.join ' && '
+
 
 if opts[:no_color] == true
-	puts "generated version postfix: #{version_postfix}"
+	puts "path to pjam configuration file: #{config_path}"
 else
-	puts dark { yellow { bold {  "generated version postfix: #{version_postfix}" } } }
+	puts dark { green { bold {  "path to pjam configuration file: #{config_path}" } } }
 end
 
-project_id = "#{Dir.pwd}/#{opts[:p]}"
-local_lib = "#{project_id}/cpanlib"
+config = JSON.parse(File.read(config_path))
 
-if (opts[:p].nil? || opts[:p].empty?)
-    Trollop::die :p, "must be set"
+if config.has_key? 'repository'
+	repo_root = "-r #{config['repository']}"
+else
+	repo_root = "-r #{ENV['PINTO_REPOSITORY_ROOT']}"
+end
+
+if opts[:no_color] == true
+	puts "pinto repository root: #{repo_root}"
+else
+	puts dark { green { bold {  "pinto repository root: #{repo_root}" } } }
+end
+
+if config.has_key? 'override'
+	override = config['override']
+else
+	override = true
+end
+
+if opts[:no_color] == true
+	puts "override mode: #{override}"
+else
+	puts dark { cyan { bold {  "override mode: #{override}" } } }
+end
+
+sources_list = []
+only_list = []
+if opts[:only].nil?
+    sources_list = config['sources']
+else
+    p_only = opts[:only].split(' ')
+    only_list = p_only	
+    sources_list = config['sources'].select {|i| p_only.include? i }
+end
+
+compile_list = []
+compile_list_pp = {}
+
+
+if opts[:no_color] == true
+	puts "generated version postfix: #{version_postfix}"
+else
+	puts dark { yellow { bold {  "generated version postfix: #{version_postfix}" } } }
 end
 
 
@@ -48,16 +119,36 @@ else
     color_flag = ''
 end
 
-config = JSON.parse(File.read("#{project_id}/pjam.json"))
-
 misc_modules =  []
 
-if config.has_key? 'modules' and opts[:no_misc] == false and opts[:skip_pinto] == false
+if opts[:dry_run] == true
+    if opts[:no_color] == true
+	puts "dry-run mode is enabled; only upcoming changes will be shown; no action will be taken"
+    else
+	puts dark { magenta  { bold {  "dry-run mode is enabled; only upcoming changes will be shown; no action will be taken" } } }
+    end
+
+	sources_list.each do |src|
+    		cmd = "cd #{project_id}/#{src} &&  svn log -r BASE:HEAD --verbose . > dry-run.log"
+    		st = system(cmd) == true or  raise "failed do cmd: #{cmd}"
+
+		if opts[:no_color] == true
+			puts "upcoming changes for #{src}:"
+		else
+	    		puts dark { magenta  { bold {  "upcoming changes for source #{src}:" } } }
+		end
+		
+		puts File.read("#{project_id}/#{src}/dry-run.log") 
+	end
+	exit(0)
+end
+
+if config.has_key? 'modules' and opts[:no_misc] == false
 
     if opts[:no_color] == true
-	puts "pulling / compiling misc modules"
+	puts "pull misc modules to pinto repository"
     else
-	puts dark { blue  { bold {  "pulling / compiling misc modules" } } }
+	puts dark { blue  { bold {  "pull misc modules to pinto repository" } } }
     end
     
     config['modules'].each do |m|
@@ -67,7 +158,7 @@ if config.has_key? 'modules' and opts[:no_misc] == false and opts[:skip_pinto] =
 	else
 	    puts dark { magenta { bold {  "pull #{m}" } } }
 	end
-	cmd ="pinto pull -s #{config['stack']} -v --use-default-message #{m} #{color_flag}"
+	cmd ="pinto #{repo_root} pull -s #{config['stack']} -v #{wd_flag} --use-default-message #{m} #{color_flag}"
         system(cmd) == true or raise "failed do cmd: #{cmd}"
         
         misc_modules << m
@@ -75,18 +166,6 @@ if config.has_key? 'modules' and opts[:no_misc] == false and opts[:skip_pinto] =
     end
 end
 
-sources_list = []
-only_list = []
-if opts[:only].nil?
-    sources_list = config['sources']
-else
-    p_only = opts[:only].split(/\s+/)
-    only_list = p_only	
-    sources_list = config['sources'].select {|i| p_only.include? i }
-end
-
-compile_list = []
-compile_list_pp = {}
 
 sources_list.each do |src|
 
@@ -107,16 +186,34 @@ sources_list.each do |src|
     else
 
 	if opts[:no_color] == true
-	    puts "add #{src} [#{distro_name}] to pinto"
+	    puts "add source #{src} [#{distro_name}] to pinto"
 	else
-    	    puts dark { magenta  { bold {  "add #{src} [#{distro_name}] to pinto" } } }
+    	    puts dark { magenta  { bold {  "add source #{src} [#{distro_name}] to pinto" } } }
         end
     
-	cmd ="cd #{project_id}/#{src} && pinto delete -v PINTO/#{distro_name} #{color_flag}"
-        system(cmd) == true
+	if opts[:update] == false
+		if ((system("cd #{project_id}/#{src} && pinto #{repo_root} list -D #{distro_name} --no-color | grep PINTO/#{distro_name}")) == true)
+			if opts[:no_color] == true
+			    puts "[#{distro_name}] already in pinto; skip update due to --no-update is enabled"
+			else
+    	    			puts dark { blue  { bold {  "[#{distro_name}] already in pinto; skip update due to --no-update is enabled" } } }
+        		end
+			update_distro = false
+		else		
+			update_distro = true 
+		end
+	else
+		update_distro = true 
+	end
 
-	cmd ="cd #{project_id}/#{src} && pinto add  -s #{config['stack']} -v --use-default-message #{distro_name} #{color_flag}"
-        system(cmd) == true or raise "failed do cmd: #{cmd}"
+	if update_distro == true 
+		unless override == false
+			cmd ="cd #{project_id}/#{src} && pinto #{repo_root} delete -v PINTO/#{distro_name} #{color_flag}"
+        		system(cmd) == true
+		end
+		cmd ="cd #{project_id}/#{src} && pinto #{repo_root} add  -s #{config['stack']} -v #{wd_flag} --use-default-message #{distro_name} #{color_flag}"
+        	system(cmd) == true or raise "failed do cmd: #{cmd}"
+	end
 
         compile_list << distro_name
         compile_list_pp[distro_name] = src
@@ -125,6 +222,15 @@ sources_list.each do |src|
     
 end
 
+if opts[:no_color] == true
+	puts "update packages list file"
+else
+    	puts dark { magenta  { bold {  "update packages list file" } } }
+end
+
+cmd = "pinto #{repo_root} list -s #{config['stack']} --format %a/%f  --no-color | sort | uniq > #{project_id}/packages.txt"
+system(cmd) == true or raise "failed do cmd: #{cmd}"
+
 unless opts[:only_pinto] == true 
 
 	misc_modules.each do |m|
@@ -135,7 +241,7 @@ unless opts[:only_pinto] == true
 		puts green { bold { "compile #{m}" } }
 	    end
     
-	    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'v' #{m} #{color_flag}"
+	    cmd = "#{env_string} && pinto #{repo_root} install -s #{config['stack']} -l #{local_lib} -o 'q' #{m} #{color_flag}"
 	    system(cmd) == true or raise "failed do cmd: #{cmd}"
 	end
 
@@ -148,7 +254,7 @@ unless opts[:only_pinto] == true
 		puts green { bold { "compile #{compile_list_pp[d]} [#{d}]" } }
 	    end
     
-	    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'q' PINTO/#{d} #{color_flag}"
+	    cmd = "#{env_string} && pinto #{repo_root} install -s #{config['stack']} -l #{local_lib} -o 'q' PINTO/#{d} #{color_flag}"
 	    system(cmd) == true or raise "failed do cmd: #{cmd}"
 
 	end
@@ -156,9 +262,9 @@ unless opts[:only_pinto] == true
 	if only_list.empty? or only_list.include? config['application']
 
 		if opts[:no_color] == true
-		    puts "make distributive from #{config['application']}"
+		    puts "make distributive from source #{config['application']}"
 		else
-		    puts yellow { bold {  "make distributive from #{config['application']}" } } 
+		    puts yellow { bold {  "make distributive from source #{config['application']}" } } 
 		end 
 
 		cmd = "export version_postfix='#{version_postfix}' && cd #{project_id}/#{config['application']} && rm -rf cpanlib && mkdir cpanlib/ && cp -r #{local_lib}/* cpanlib/ && rm -rf *.gz && ./Build realclean --quiet 1>/dev/null && perl Build.PL --quiet 1>/dev/null 2>module_build.err.log && ./Build manifest --quiet 2>/dev/null 1>/dev/null && ./Build dist --quiet 1>/dev/null && ln -fs `ls #{project_id}/#{config['application']}/*.gz` #{project_id}/current.tar.gz && echo -n `ls *.gz` > #{project_id}/current.txt"
@@ -167,14 +273,15 @@ unless opts[:only_pinto] == true
 
 
 		if opts[:no_color] == true
-		    puts "testing #{config['application']}"
+		    puts "testing source #{config['application']}"
 		else
-		    puts cyan { bold {  "testing #{config['application']}" } }
+		    puts cyan { bold {  "testing source #{config['application']}" } }
 		end 
 
-		cmd = "cd #{project_id} && pinto install -s #{config['stack']} -l #{local_lib} -o 'test-only' PINTO/`cat current.txt` #{color_flag}"
+		cmd = "cd #{project_id} && #{env_string} && pinto #{repo_root} install -s #{config['stack']} -l #{local_lib} -o 'test-only' PINTO/`cat current.txt` #{color_flag}"
 		system(cmd) == true or raise "failed do cmd: #{cmd}"
 
 	end
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pjam
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -75,9 +75,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Pjam is glue between pinto and your scm. In other words pjam is a wrapper
-  around pinto client to create distribution archive of perl applications from source
-  code using pinto.
+description: Pjam is a tool which enables automatic creation of perl applications
+  distribution archives from source code using pinto
 email: melezhik@gmail.com
 executables:
 - pjam