pjam 0.0.11.pre → 0.1.0

data/bin/pjam

@@ -22,8 +22,17 @@ EOS
     opt :no_color, "do not 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
 end
 
+version_postfix = `date +-rev-%Y-%B-%d-%H-%M`.chomp!
+
+
+if opts[:no_color] == true
+	puts "generated version postfix: #{version_postfix}"
+else
+	puts dark { yellow { bold {  "generated version postfix: #{version_postfix}" } } }
+end
 
 project_id = "#{Dir.pwd}/#{opts[:p]}"
 local_lib = "#{project_id}/cpanlib"
@@ -43,7 +52,7 @@ config = JSON.parse(File.read("#{project_id}/pjam.json"))
 
 misc_modules =  []
 
-if config.has_key? 'modules' and opts[:no_misc] == false
+if config.has_key? 'modules' and opts[:no_misc] == false and opts[:skip_pinto] == false
 
     if opts[:no_color] == true
 	puts "pulling / compiling misc modules"
@@ -58,7 +67,7 @@ if config.has_key? 'modules' and opts[:no_misc] == false
 	else
 	    puts dark { magenta { bold {  "pull #{m}" } } }
 	end
-	cmd ="pinto pull -s #{config['stack']} -v #{m} #{color_flag}"
+	cmd ="pinto pull -s #{config['stack']} -v --use-default-message #{m} #{color_flag}"
         system(cmd) == true or raise "failed do cmd: #{cmd}"
         
         misc_modules << m
@@ -67,10 +76,12 @@ if config.has_key? 'modules' and opts[:no_misc] == false
 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
 
@@ -82,7 +93,7 @@ sources_list.each do |src|
     cmd = "cd #{project_id}/#{src} && rm -rf cpanlib && svn up "
     st = system(cmd) == true or  raise "failed do cmd: #{cmd}" 
 
-    cmd = "cd #{project_id}/#{src} && rm -rf *.gz && rm -rf MANIFEST && perl Build.PL --quiet 1>/dev/null 2>module_build.err.log  && ./Build realclean && 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"
+    cmd = "export version_postfix='#{version_postfix}' && cd #{project_id}/#{src} && rm -rf *.gz && rm -rf MANIFEST && perl Build.PL --quiet 1>/dev/null 2>module_build.err.log  && ./Build realclean && 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"
     system(cmd) == true or raise "failed do cmd: #{cmd}"
 
     distro_name = `cd #{project_id}/#{src} &&  ls *.gz`.chomp!
@@ -104,7 +115,7 @@ sources_list.each do |src|
 	cmd ="cd #{project_id}/#{src} && pinto delete -v PINTO/#{distro_name} #{color_flag}"
         system(cmd) == true
 
-	cmd ="cd #{project_id}/#{src} && pinto add  -s #{config['stack']} -v #{distro_name} #{color_flag}"
+	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}"
 
         compile_list << distro_name
@@ -114,49 +125,56 @@ sources_list.each do |src|
     
 end
 
+unless opts[:only_pinto] == true 
 
-misc_modules.each do |m|
+	misc_modules.each do |m|
 
-    if opts[:no_color] == true
-	puts "compile #{m}"
-    else
-	puts green { bold { "compile #{m}" } }
-    end
+	    if opts[:no_color] == true
+		puts "compile #{m}"
+	    else
+		puts green { bold { "compile #{m}" } }
+	    end
     
-    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'q' #{m} #{color_flag}"
-    system(cmd) == true or raise "failed do cmd: #{cmd}"
-end
+	    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'v' #{m} #{color_flag}"
+	    system(cmd) == true or raise "failed do cmd: #{cmd}"
+	end
 
 
-compile_list.each do |d|
+	compile_list.each do |d|
 
-    if opts[:no_color] == true
-	puts "compile #{compile_list_pp[d]} [#{d}]"
-    else
-	puts green { bold { "compile #{compile_list_pp[d]} [#{d}]" } }
-    end
+	    if opts[:no_color] == true
+		puts "compile #{compile_list_pp[d]} [#{d}]"
+	    else
+		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}"
-    system(cmd) == true or raise "failed do cmd: #{cmd}"
-end
+	    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'q' PINTO/#{d} #{color_flag}"
+	    system(cmd) == true or raise "failed do cmd: #{cmd}"
 
+	end
 
-if opts[:no_color] == true
-    puts "make distributive from #{config['application']}"
-else
-    puts yellow { bold {  "make distributive from #{config['application']}" } } 
-end 
+	if only_list.empty? or only_list.include? config['application']
 
-cmd = "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"
-system(cmd) == true or raise "failed do cmd: #{cmd}"
+		if opts[:no_color] == true
+		    puts "make distributive from #{config['application']}"
+		else
+		    puts yellow { bold {  "make distributive from #{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"
+		puts cmd
+		system(cmd) == true or raise "failed do cmd: #{cmd}"
 
-if opts[:no_color] == true
-    puts "testing #{config['application']}"
-else
-    puts cyan { bold {  "testing #{config['application']}" } }
-end 
 
-cmd = "cd #{project_id} && pinto 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}"
+		if opts[:no_color] == true
+		    puts "testing #{config['application']}"
+		else
+		    puts cyan { bold {  "testing #{config['application']}" } }
+		end 
+
+		cmd = "cd #{project_id} && pinto 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

data/lib/pjam-server.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+
+require 'sinatra'
+
+get %r{/build/(.*)} do |req|
+
+	content_type :text
+	args = req.split '/'
+	project = args.shift
+	flags = ''
+	unless args.empty?
+		args.each do |a|
+			flags << "--#{a} "
+		end
+	end
+	command = "pjam -p #{project}  #{flags} 1>pjam-server.log  2>&1"
+	st = system(command)
+	if st == true
+		body File.read("pjam-server.log")
+	else
+		body File.read("pjam-server.log")
+		status 500
+	end
+				
+end
+
+get '/' do
+	content_type :text
+	`ls -1  2>&1`
+end
+

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: pjam
 version: !ruby/object:Gem::Version
-  version: 0.0.11.pre
-  prerelease: 7
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Alexey Melezhik
@@ -75,38 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !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.
@@ -117,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pjam.rb
+- lib/pjam-server.rb
 - bin/pjam
 homepage: https://github.com/melezhik/jam
 licenses:
@@ -134,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25