nixenvironment 0.0.77 → 0.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b86af60e19d716873c260f3e03b4054282c3d569
-  data.tar.gz: 4fbe4725f2639e52efb70269793c91e91f09d9de
+  metadata.gz: e93a34bbb5aeb1dcf4ab1dd60001ea18ed6b3ef6
+  data.tar.gz: c684207dbc816f36b1b6632a3bc2c89e8d98e288
 SHA512:
-  metadata.gz: c57d21a9a174db9c60083c19b65bcb2be31292122cbdc4c79291f8ff481e18060cd5aae0ae8f566ec5cb1ef042adb9df7913d8835b29a159f62613d44fe7d9ca
-  data.tar.gz: 5fc56573955f6d973ddb8a0b0a3e5da013cce5dcd8c88373475c6dc8a445106b3a846799af53af6f93bd36454fa4a9a3bc9bf4b5bfe4f997a216bee6cbea3afa
+  metadata.gz: d84393272f2d4b6073c88959ab78b3bdf7e0b196de91b1e0a74d98aea157741b8ef7a6e87cc3896929b963b0ef9385c8074df444f5b8c11a4c619a89998dd597
+  data.tar.gz: 09a803f91ce63521378085c2de85c505c68c7eb68a713e660826027952f6f1ebffb3193ebd5ccee806c90b7db3da04be1a9e122ddf7280926f8d209d69c34017

data/bin/nixenvironment

@@ -269,21 +269,33 @@ 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 '--stop', 'Stop Jenkins master'
   c.action do |_args, options|
-    if options.init
-      MasterInitializer.new.start
-    elsif options.deinit
-      MasterDeinitializer.new.start
+    begin
+      if options.init
+        MasterInitializer.new.start
+      elsif options.deinit
+        MasterDeinitializer.new.start
+      end
+    rescue AlreadyInitialized
+      puts("Skip by reason: Already initialized")
+    end
+
+    if options.stop
+      MasterStarter.new.stop
     end
 
     if options.start
-      starter = MastertStarter.new
+      starter = MasterStarter.new
 
       begin
         starter.start
       rescue SystemExit, Interrupt
         starter.stop
       end
+    elsif options.start_pu
+      MasterStarter.new.start_pu
     end
   end
 end
@@ -356,13 +368,16 @@ def init
         puts "Push ... #{dest_url}"
         Git.remote_add(repo_name, dest_url)
         Git.commit(:m => 'Initial commit')
+        Git.checkout(Git::DEVELOP, :b => true)
         Git.push(repo_name, Git::DEFAULT_REFSPEC, :f => true)
+        Git.push(repo_name, Git::DEVELOP, :f => true)
         raise "Push failed for #{dest_url} repository!" unless Git.last_cmd_success?
       end
     end
 
     puts "Cloning new created project from #{dest_url} to #{local_directory_to_clone} ..."
     Git.clone(dest_url, local_directory_to_clone, :r => true)
+    Dir.chdir(local_directory_to_clone) { |_path| Git.checkout(Git::DEVELOP) }
     raise "Error cloning #{dest_url}!" unless Git.last_cmd_success?
   rescue => e
     error('Project initialization failed!', e)

data/lib/nixenvironment.rb

@@ -16,4 +16,6 @@ require 'nixenvironment/jenkins/slave/slave_starter'
 # Master
 require 'nixenvironment/jenkins/master/master_initializer'
 require 'nixenvironment/jenkins/master/master_deinitializer'
-require 'nixenvironment/jenkins/master/master_starter'
+require 'nixenvironment/jenkins/master/master_starter'
+
+require 'nixenvironment/jenkins/Modules/exceptions'

data/lib/nixenvironment/git.rb

@@ -9,6 +9,7 @@ module Nixenvironment
     @binary_name    = 'git'
 
     HEAD            = 'HEAD'
+    DEVELOP         = 'develop'
     REMOTE_MASTER   = 'refs/heads/master'
     DEFAULT_REFSPEC = "#{HEAD}:#{REMOTE_MASTER}"
 
@@ -28,6 +29,7 @@ module Nixenvironment
     MESSAGE_OPT     = '--message'
     FORCE_OPT       = '--force'
     PORCELAIN_OPT   = '--porcelain'
+    BRANCH_OPT      = '-b'
 
     # options
     #   :recursive, :r => after the clone is created, initialize all submodules within
@@ -54,6 +56,7 @@ module Nixenvironment
     def self.checkout(branch, options = {})
       arr_opts = []
       arr_opts << ORPHAN_OPT if options[:orphan]
+      arr_opts << BRANCH_OPT if options[:branch] || options[:b]
       arr_opts << branch
 
       execute(CHECKOUT_CMD, arr_opts)

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

@@ -51,16 +51,21 @@ module AppletHelper
     end
 
     def stop_applets
-        javaProcesses = `jps -v`
-        applets = applets_in_environment
+        begin
+            java_processes = `jps -v`
+            applets = applets_in_environment
         
-        applets.each do |file_path|
-            javaProcesses.each_line do |line|
-                if line.include? file_path
-                    pid = line.split.first
-                    Process.kill('QUIT', pid.to_i)
+            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)
+                    end
                 end
             end
+            puts("Stop applets: done")
+        rescue
+            puts("Stop applets: fail")
         end
     end
 end

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

@@ -0,0 +1,5 @@
+class AlreadyInitialized < Exception
+end
+
+class NotInitialized < Exception
+end

data/lib/nixenvironment/jenkins/master/iJenkins_autorun

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+nixenvironment master --init --start
+sh

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

@@ -1,7 +1,8 @@
 require_relative '../modules/applet_helper'
 require_relative '../modules/paths'
+require_relative '../modules/exceptions'
 
-class MastertStarter 
+class MasterStarter
     include AppletHelper
     include Paths
     
@@ -10,39 +11,71 @@ class MastertStarter
         `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
+      `osascript -e 'tell application "System Events" to make login item at end with properties {path:"#{__dir__}/iJenkins_autorun", hidden:true, name:"iJenkins Master"}'`
+    end
+
     public
     def start
-        raise "Сan't run a slave." unless should_start_slave
-        
+        raise NotInitialized unless should_start_slave
+
+        add_to_autorun
+
         # Applet
         start_master
         
         # Start Unity cache server
-        cacheThread = Thread.new do
-            FileUtils::mkdir_p("#{path_to_unity_cache}/Cache5.0")
-            FileUtils::mkdir_p("#{path_to_unity_cache}/Cache")
-            `#{path_to_environment}/CacheServer/RunOSX.command --path #{path_to_unity_cache}/Cache5.0 --legacypath #{path_to_unity_cache}/Cache`
-        end
+        start_cache_server
         
         # Start provisioning updater
-        serverThread = Thread.new do
-            Dir.chdir(path_to_provisioning_updater) do
-                `./run -e production -p 3000`
-            end
-        end
-        
-        cacheThread.join
-        serverThread.join
+        start_pu
+
         true
     end
-    
+
+    def start_pu
+      stop_pu
+
+      fork do
+        Dir.chdir(path_to_provisioning_updater) do
+          `./run -e production -p 3000`
+        end
+      end
+    end
+
+    def start_cache_server
+      stop_cache_server
+
+      fork do
+        FileUtils::mkdir_p("#{path_to_unity_cache}/Cache5.0")
+        FileUtils::mkdir_p("#{path_to_unity_cache}/Cache")
+        `#{path_to_environment}/CacheServer/RunOSX.command --path #{path_to_unity_cache}/Cache5.0 --legacypath #{path_to_unity_cache}/Cache`
+      end
+    end
+
     def stop
         stop_applets
+        stop_pu
+        stop_cache_server
+        kill_proc("rails")
+    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
+    end
+
+    def stop_cache_server
+      begin
         kill_proc("#{path_to_environment}/CacheServer/")
-        kill_proc("rails")
-        
-        true
+        puts("Stop Unity cache server: done")
+      rescue
+        puts("Stop Unity cache server: fail")
+      end
     end
 end

data/lib/nixenvironment/jenkins/slave/slave_initializer.rb

@@ -4,6 +4,7 @@ require_relative '../modules/provisioning_helper'
 require_relative '../modules/keychain_helper'
 require_relative '../modules/backup_helper'
 require_relative '../modules/gem_helper'
+require_relative '../modules/exceptions'
 
 class SlaveInitializer
     include SshHelper
@@ -14,7 +15,7 @@ class SlaveInitializer
     include GemHelper
     
     def start
-        raise 'Backup is already exist' if check_backup_exist
+        raise AlreadyInitialized if check_backup_exist
         
         # Git
         clone_environment

data/lib/nixenvironment/jenkins/slave/slave_starter.rb

@@ -1,6 +1,7 @@
 require_relative '../modules/applet_helper'
 require_relative '../modules/git_helper'
 require_relative '../modules/provisioning_helper'
+require_relative '../modules/exceptions'
 
 class SlaveStarter
     include AppletHelper
@@ -8,7 +9,7 @@ class SlaveStarter
     include ProvisioningHelper
 
     def start
-        raise "Сan't run a slave." unless should_start_slave
+        raise NotInitialized unless should_start_slave
         
         # Git
         hook_thread = set_git_hook do

data/lib/nixenvironment/version.rb

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

data/nixenvironment.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize'
   spec.add_dependency 'CFPropertyList', '= 2.2.8'
   spec.add_dependency 'pilot',          '~> 1.0.0'
-  spec.add_dependency 'nokogiri',       '= 1.6.7.rc3'
+  spec.add_dependency 'nokogiri',       '= 1.6.7.2'
   spec.add_dependency 'net-scp'
 
   # Development only

data/test.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Enter your gem name below (do not enter version number)
+# or pass it as the first argument to the shell script
+GEM_NAME="nixenvironment"
+
+# Don't touch these
+GEMSPEC_SUFFIX=".gemspec"
+GEM_BUILD_CMD="gem build"
+
+# if there is an argument to the script, define the gem name with it
+if [ $# -eq 1 ]; then
+	GEM_NAME=$1
+elif [ $# -gt 1 ]; then
+	echo "You entered too many arguments.  Please specify the name of your gem as the argument to the script." >&2
+	exit 1
+fi
+
+# if the gem name has not been defined, print error message and exit
+if [ -z "$GEM_NAME" ]; then
+	echo "You did not enter a gem name.  Please include it as an argument to the script or hard code it as a variable in the script." >&2
+	exit 1
+fi
+
+# run the gem build and parse for the gem release filename
+GEM_BUILD_NAME=$($GEM_BUILD_CMD "$GEM_NAME$GEMSPEC_SUFFIX" |  awk '/File/ {print $2}' -)
+
+# if the build failed (i.e. no file name obtained above), print error message and exit
+if [ -z "$GEM_BUILD_NAME" ]; then
+	echo "The gem build failed.  Please confirm the gem name and try again." >&2
+	exit 1
+fi
+
+# if above succeeded, update bundle and install the gem that was compiled
+bundle update
+sudo gem install --local $GEM_BUILD_NAME
+
+exit 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.77
+  version: 0.0.79
 platform: ruby
 authors:
 - Karen
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ocunit2junit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -99,14 +99,14 @@ dependencies:
   name: pilot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -115,96 +115,96 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.rc3
+        version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.rc3
+        version: 1.6.7.2
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Installs, updates and manages inner environment stuff to make build and
@@ -217,7 +217,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -242,12 +242,14 @@ files:
 - lib/nixenvironment/git.rb
 - lib/nixenvironment/jenkins/Modules/applet_helper.rb
 - lib/nixenvironment/jenkins/Modules/backup_helper.rb
+- lib/nixenvironment/jenkins/Modules/exceptions.rb
 - lib/nixenvironment/jenkins/Modules/gem_helper.rb
 - lib/nixenvironment/jenkins/Modules/git_helper.rb
 - lib/nixenvironment/jenkins/Modules/keychain_helper.rb
 - lib/nixenvironment/jenkins/Modules/paths.rb
 - lib/nixenvironment/jenkins/Modules/provisioning_helper.rb
 - lib/nixenvironment/jenkins/Modules/ssh_helper.rb
+- lib/nixenvironment/jenkins/master/iJenkins_autorun
 - lib/nixenvironment/jenkins/master/master_deinitializer.rb
 - lib/nixenvironment/jenkins/master/master_initializer.rb
 - lib/nixenvironment/jenkins/master/master_starter.rb
@@ -259,6 +261,7 @@ files:
 - lib/nixenvironment/version.rb
 - lib/nixenvironment/xcodebuild.rb
 - nixenvironment.gemspec
+- test.sh
 - utils/XcodeIconTagger/IconTagger
 - utils/XcodeIconTagger/masks/OneLineMask.png
 - utils/XcodeIconTagger/masks/TwoLineMask.png
@@ -276,17 +279,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility