pjam 0.0.6.pre → 0.0.7.pre

data/bin/pjam

@@ -41,6 +41,30 @@ end
 
 config = JSON.parse(File.read("#{project_id}/pjam.json"))
 
+misc_modules =  []
+
+if config.has_key? 'modules' and opts[:no_misc] == false
+
+    if opts[:no_color] == true
+	puts "pulling / compiling misc modules"
+    else
+	puts dark { blue  { bold {  "pulling / compiling misc modules" } } }
+    end
+    
+    config['modules'].each do |m|
+
+	if opts[:no_color] == true
+	    puts "pull #{m}"
+	else
+	    puts dark { magenta { bold {  "pull #{m}" } } }
+	end
+	cmd ="pinto pull -s #{config['stack']} -v #{m} #{color_flag}"
+        system(cmd) == true or raise "failed do cmd: #{cmd}"
+        
+        misc_modules << m
+
+    end
+end
 
 sources_list = []
 if opts[:only].nil?
@@ -91,47 +115,29 @@ sources_list.each do |src|
 end
 
 
-compile_list.each do |d|
+misc_modules.each do |m|
 
     if opts[:no_color] == true
-	puts "compile #{compile_list_pp[d]} [#{d}]"
+	puts "compile #{m}"
     else
-	puts green { bold { "compile #{compile_list_pp[d]} [#{d}]" } }
+	puts green { bold { "compile #{m}" } }
     end
     
-    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'q' PINTO/#{d} #{color_flag}"
+    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'q' #{m} #{color_flag}"
     system(cmd) == true or raise "failed do cmd: #{cmd}"
 end
 
 
-if config.has_key? 'modules' && opts[:no_misc] == false
+compile_list.each do |d|
 
     if opts[:no_color] == true
-	puts "pulling / compiling misc modules"
+	puts "compile #{compile_list_pp[d]} [#{d}]"
     else
-	puts dark { blue  { bold {  "pulling / compiling misc modules" } } }
+	puts green { bold { "compile #{compile_list_pp[d]} [#{d}]" } }
     end
     
-    config['modules'].each do |m|
-
-	if opts[:no_color] == true
-	    puts "pull #{m}"
-	else
-	    puts dark { magenta { bold {  "pull #{m}" } } }
-	end
-	cmd ="pinto pull -s #{config['stack']} -v #{m} #{color_flag}"
-        system(cmd) == true or raise "failed do cmd: #{cmd}"
-        
-        if opts[:no_color] == true
-    	    puts "compile #{m}"
-        else
-	    puts dark { 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 'q' PINTO/#{d} #{color_flag}"
+    system(cmd) == true or raise "failed do cmd: #{cmd}"
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pjam
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre
+  version: 0.0.7.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ 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'
 description: Smart pinto glue - jam between source code and pinto
 email: melezhik@gmail.com
 executables: