nixenvironment 0.0.79 → 0.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93a34bbb5aeb1dcf4ab1dd60001ea18ed6b3ef6
-  data.tar.gz: c684207dbc816f36b1b6632a3bc2c89e8d98e288
+  metadata.gz: dd63367a69b5f5737baa98d6cadf88839fee29bf
+  data.tar.gz: 5f63c6ccf7e81b33e404b7b569203b9b1926cb9d
 SHA512:
-  metadata.gz: d84393272f2d4b6073c88959ab78b3bdf7e0b196de91b1e0a74d98aea157741b8ef7a6e87cc3896929b963b0ef9385c8074df444f5b8c11a4c619a89998dd597
-  data.tar.gz: 09a803f91ce63521378085c2de85c505c68c7eb68a713e660826027952f6f1ebffb3193ebd5ccee806c90b7db3da04be1a9e122ddf7280926f8d209d69c34017
+  metadata.gz: ea3a917b271b54d0193487be7c32990c67e972f9f78831c0450aa29d182be309418986588f38288a0e7dfa825a9103e8ca152462d08d621327728a51ec75a43a
+  data.tar.gz: 4992b540a7a2949fbec739fb35574338e1f1042584cbf41708101a454af12a8ac5aed21ebc0f0e162cc4b9824f5a21a677444d34d26e8dff3f7d02192a33b7a9

data/bin/nixenvironment

@@ -13,6 +13,15 @@ require 'nokogiri'
 
 include Nixenvironment
 
+# ------------ WARNING: Удалить это если не поможет с крешем https://github.com/CocoaPods/CocoaPods/issues/2483#issuecomment-57505048
+require 'CFPropertyList'
+require 'CFPropertyList/rbNokogiriParser'
+
+def CFPropertyList.xml_parser_interface
+  CFPropertyList::NokogiriXMLParser
+end
+# ------------------------------------------------
+
 CONFIG_SETTINGS_FILE_PATH = File.join(File.dirname(__FILE__), CONFIG_SETTINGS_FILE_NAME)
 
 program :name,        'nixenvironment'
@@ -269,9 +278,12 @@ command :master do |c|
   c.option '--init', 'Init Jenkins master'
   c.option '--start', 'Start Jenkins master'
   c.option '--deinit', 'Deinit Jenkins master'
-  c.option '--start_pu', 'Start Provisioning updater'
+  c.option '--start_pu ENV', String, 'Start Provisioning updater. To run develop server enter "develop" argument'
+  c.option '--start_cs', 'Start Unity cache server.'
   c.option '--stop', 'Stop Jenkins master'
   c.action do |_args, options|
+    options.default :start_pu => ''
+
     begin
       if options.init
         MasterInitializer.new.start
@@ -294,8 +306,10 @@ command :master do |c|
       rescue SystemExit, Interrupt
         starter.stop
       end
-    elsif options.start_pu
-      MasterStarter.new.start_pu
+    elsif options.start_pu != ''
+      MasterStarter.new.start_pu(options.start_pu != 'develop')
+    elsif options.start_cs
+      MasterStarter.new.start_cache_server
     end
   end
 end

data/lib/nixenvironment/jenkins/Modules/applet_helper.rb

@@ -53,13 +53,16 @@ module AppletHelper
     def stop_applets
         begin
             java_processes = `jps -v`
+
             applets = applets_in_environment
-        
+            applets << path_to_jenkins_master_applet
+
             applets.each do |file_path|
                 java_processes.each_line do |line|
                     if line.include? file_path
                         pid = line.split.first
-                        Process.kill('QUIT', pid.to_i)
+                        `kill -9 #{pid}`
+                        puts("Process #{pid} stoped")
                     end
                 end
             end

data/lib/nixenvironment/jenkins/master/master_starter.rb

@@ -8,8 +8,7 @@ class MasterStarter
     
     private
     def kill_proc(name)
-        `pids=$(ps -fu $USER | grep "#{name}" | grep -v "grep" | awk '{print $2}')`
-        `for pid in ${pids[@]}; do kill -9 $pid; done`
+        `pids=$(ps -fu $USER | grep "#{name}" | grep -v "grep" | awk '{print $2}'); for pid in ${pids[@]}; do kill -9 $pid; done`
     end
 
     def add_to_autorun
@@ -34,12 +33,14 @@ class MasterStarter
         true
     end
 
-    def start_pu
-      stop_pu
-
+    def start_pu(on_production = true)
       fork do
         Dir.chdir(path_to_provisioning_updater) do
-          `./run -e production -p 3000`
+          if on_production
+            `./run -e production -p 3000`
+          else
+            `./run`
+          end
         end
       end
     end
@@ -62,20 +63,10 @@ class MasterStarter
     end
 
     def stop_pu
-      begin
-        `kill -9 "$(cat #{path_to_provisioning_updater}/tmp/pids/server.pid)" 2>/dev/null`
-        puts("Stop Provisioning updater: done")
-      rescue
-        puts("Stop Provisioning updater: fail")
-      end
+      `kill -9 "$(cat #{path_to_provisioning_updater}/tmp/pids/server.pid)" 2>/dev/null`
     end
 
     def stop_cache_server
-      begin
-        kill_proc("#{path_to_environment}/CacheServer/")
-        puts("Stop Unity cache server: done")
-      rescue
-        puts("Stop Unity cache server: fail")
-      end
+      kill_proc("#{path_to_environment}/CacheServer/")
     end
 end

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.79'
+  VERSION = '0.0.80'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.79
+  version: 0.0.80
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods