chefrepo-builder 0.9.20 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51ee77d78abab279df1adcfdf118a24c6de4382
-  data.tar.gz: 3cacf5b082da39818193aea7e5fa86d4480e1fd1
+  metadata.gz: d19ad55aace6aff0400b888ba5dae68edad76811
+  data.tar.gz: c2fbec785ac2cb9f0b76f01d2a6b2596c5c7b7ff
 SHA512:
-  metadata.gz: 20626569f036191ebc7b9f7bc2757e001dbd96eb8a0e9c1ac2f7b075ba84c7627700b8dea1eb6f26937e66d6c3906fcdad2de33dc695d70e0fc0c61f2d046a74
-  data.tar.gz: 46b1b364fe6b0b6f2819a0410dbac37b8ac5283b66e4dd3d53a4c861c8c530eab798d8a8d9725b51fa83574d9ad2a11d228fcfd1448d4db542cfd8d7597948b6
+  metadata.gz: 6c24d93a3f097afbe85748dec914018b4e3c96f56fbb1c2ac60e484bc68ea1d44ec22aba2884d2029de905e4c95f61a1962cc8101113ac8a16ee23ade0eaefa4
+  data.tar.gz: 93e9c1e5b00ac6289c5e34d73670480b794bdd76344749a6b8c77e02396e664a7d5ae2aed8651df13606c26fc5d66b6a492cb35b68478cd9f1205c6326a8bba1

data/Gemfile.lock

@@ -0,0 +1,146 @@
+PATH
+  remote: .
+  specs:
+    chefrepo-builder (0.9.22)
+      cicd-builder (>= 0.9.14)
+      json (= 1.8.1)
+
+PATH
+  remote: ../cicd-builder
+  specs:
+    cicd-builder (0.9.25)
+      artifactory (>= 2.2.1, < 2.3)
+      awesome_print (= 1.2.0, < 1.3)
+      aws-sdk (>= 2.0, < 2.1)
+      chef (>= 11.18.2, < 12)
+      git (>= 1.2.7, < 1.3)
+      inifile (>= 3.0.0, < 3.1)
+      json (= 1.8.1, < 1.9)
+      logging (>= 1.8.2, < 1.9)
+      semverse (>= 1.2.1, < 1.3)
+      yajl-ruby (>= 1.2.1, < 1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    artifactory (2.2.1)
+    awesome_print (1.2.0)
+    aws-sdk (2.0.28)
+      aws-sdk-resources (= 2.0.28)
+    aws-sdk-core (2.0.28)
+      builder (~> 3.0)
+      jmespath (~> 1.0)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+    aws-sdk-resources (2.0.28)
+      aws-sdk-core (= 2.0.28)
+    builder (3.2.2)
+    chef (11.18.6)
+      chef-zero (~> 2.2, >= 2.2.1)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 1.2)
+      highline (~> 1.6, >= 1.6.9)
+      mime-types (~> 1.16)
+      mixlib-authentication (~> 1.3)
+      mixlib-cli (~> 1.4)
+      mixlib-config (~> 2.0)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 1.4)
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1)
+      ohai (~> 7.4)
+      plist (~> 3.1.0)
+      pry (~> 0.9)
+      rest-client (>= 1.0.4, <= 1.6.7)
+    chef-zero (2.2.1)
+      ffi-yajl (~> 1.1)
+      hashie (~> 2.0)
+      mixlib-log (~> 1.3)
+      rack
+    coderay (1.1.0)
+    cucumber (0.10.7)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    ffi (1.9.6)
+    ffi-yajl (1.4.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.2)
+    gherkin (2.4.21)
+      json (>= 1.4.6)
+    git (1.2.9.1)
+    hashie (2.1.2)
+    highline (1.7.1)
+    inifile (3.0.0)
+    ipaddress (0.8.0)
+    jmespath (1.0.2)
+      multi_json (~> 1.0)
+    json (1.8.1)
+    json_pure (1.8.1)
+    libyajl2 (1.2.0)
+    little-plugger (1.1.3)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.5.0)
+    mixlib-config (2.1.0)
+    mixlib-log (1.6.0)
+    mixlib-shellout (1.6.1)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    net-ssh (2.9.2)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.2.0)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    ohai (7.4.1)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.1)
+      ipaddress
+      mime-types (~> 1.16)
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log
+      mixlib-shellout (~> 1.2)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    plist (3.1.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.0)
+    rake (10.3.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rubygems-tasks (0.2.4)
+    semverse (1.2.1)
+    slop (3.6.0)
+    systemu (2.6.4)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    tins (1.3.3)
+    wmi-lite (1.0.0)
+    yajl-ruby (1.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.6)
+  chefrepo-builder!
+  cicd-builder!
+  cucumber (~> 0.10.2)
+  json_pure
+  rake
+  rubygems-tasks (>= 0.2, < 1.1)

data/bin/chefrepo

@@ -30,4 +30,4 @@ $:.unshift(add_path)
 require 'cicd/builder/chefrepo'
 
 # =====================================================================================================================
-exit CiCd::Builder::ChefRepoBuilder.new().run()
+exit CiCd::Builder::ChefRepo::Runner.new().run()

data/chefrepo-builder.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'cicd-builder', '>= 0.9.14'
   gem.add_dependency 'json', '= 1.8.1'
 
-  gem.add_development_dependency 'bundler', '~> 1.0'
-  gem.add_development_dependency 'rake', '~> 10.3'
-  gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
-  gem.add_development_dependency 'cucumber', '~> 0'
+  gem.add_development_dependency 'bundler', '>= 1.6', '< 1.7'
+  gem.add_development_dependency 'rake', '>= 10.3', '< 11'
+  gem.add_development_dependency 'rubygems-tasks', '>= 0.2', '< 1.1'
+  gem.add_development_dependency 'cucumber', '>= 0.10.7', '< 0.11'
 end

data/lib/cicd/builder/chefrepo.rb

@@ -8,45 +8,45 @@ module CiCd
 
     require 'cicd/builder/chefrepo/version'
 
-    #noinspection ALL
-    class ChefRepoBuilder < BuilderBase
+    module ChefRepo
+      class Runner < BuilderBase
 
-      def initialize()
-        super
-        @default_options[:builder] = VERSION
-      end
+        def initialize()
+          super
+          @default_options[:builder] = VERSION
+        end
 
-      # ---------------------------------------------------------------------------------------------------------------
-      def getBuilderVersion
-        {
-            version:  VERSION,
-            major:    MAJOR,
-            minor:    MINOR,
-            patch:    PATCH,
-        }
-      end
+        # ---------------------------------------------------------------------------------------------------------------
+        def getBuilderVersion
+          {
+              version:  VERSION,
+              major:    MAJOR,
+              minor:    MINOR,
+              patch:    PATCH,
+          }
+        end
 
-      # ---------------------------------------------------------------------------------------------------------------
-      def checkEnvironment()
-        # We fake some of the keys that the will need later ...
-        faked = {}
-        %w(VERSION RELEASE).each do |key|
-          unless ENV.has_key?(key)
-            ENV[key]="faked"
-            faked[key] = true
+        # ---------------------------------------------------------------------------------------------------------------
+        def checkEnvironment()
+          # We fake some of the keys that the will need later ...
+          faked = {}
+          %w(VERSION RELEASE VARIANT).each do |key|
+            unless ENV.has_key?(key)
+              ENV[key]='faked'
+              faked[key] = true
+            end
           end
+          ret = super
+          faked.each do |k,v|
+            ENV.delete k
+          end
+          ret
         end
-        ret = super
-        faked.each do |k,v|
-          ENV.delete k
-        end
-        ret
-      end
 
-      # ---------------------------------------------------------------------------------------------------------------
-      def run()
-        $stdout.write("ChefRepoBuilder v#{CiCd::Builder::ChefRepo::VERSION}\n")
-        @default_options[:env_keys] = %w(
+        # ---------------------------------------------------------------------------------------------------------------
+        def setup()
+          $stdout.write("ChefRepoBuilder v#{CiCd::Builder::ChefRepo::VERSION}\n")
+          @default_options[:env_keys] << %w(
 																			JENKINS_HOME
 																			BUILD_NUMBER
                                       JOB_NAME
@@ -54,88 +54,97 @@ module CiCd
 
 																			PROJECT_NAME
                                       REPO_DIR
-                                      REPO_PARTS
 
                                       VERSION
                                       RELEASE
-
-																			AWS_S3_BUCKET
+                                      VARIANT
 																		)
-        @default_options[:gen] = '1.0.0'
-        if 0 == super
-          # noop
+          # @default_options[:gen] = '1.0.0'
+          super
         end
 
-        @vars[:return_code]
-      end
-
-      # ---------------------------------------------------------------------------------------------------------------
-      def getVars()
-        super
-        @vars[:return_code]
-      end
-
-      # ---------------------------------------------------------------------------------------------------------------
-      def prepareBuild()
-        super
-        local = {}
-        %w(artifacts latest).each do |dir|
-          local[dir] = "#{ENV['WORKSPACE']}/#{dir}"
-          unless File.directory?(dir)
-            Dir.mkdir(dir)
+        # # ---------------------------------------------------------------------------------------------------------------
+        # def getVars()
+        #   super
+        #   @vars[:return_code]
+        # end
+
+        # ---------------------------------------------------------------------------------------------------------------
+        def prepareBuild()
+          ret = super
+          if ret == 0
+            unless ENV.has_key?('BUILD_STORE')
+              @vars[:build_store] = File.join(ENV['WORKSPACE'],'latest')
+            end
+            @vars[:build_ext] = 'tar.bz2'
+            @vars[:build_pkg] = File.join(@vars[:local_dirs]['artifacts'],@vars[:build_nmn]+".#{@vars[:build_ext]}")
+            [ :build_chk, :build_mff, :build_mdf ].each do |file|
+              @vars[file] = File.join(@vars[:local_dirs]['artifacts'],File.basename(@vars[file]))
+            end
+            @vars[:latest_pkg]= "#{@vars[:build_store]}/#{@vars[:build_nmn]}.#{@vars[:build_ext]}"
+
+            artifacts     = []
+            scripts       = File.join(ENV['WORKSPACE'], ENV['REPO_DIR'], 'scripts', '')
+            scripts_glob  = File.join(scripts,'**','**')
+            Dir.glob(scripts_glob).each do |script|
+              if File.file?(script)
+                addArtifact(artifacts, script, scripts)
+              end
+            end
+            @vars[:artifacts] = artifacts
+            ret = getLatest()
           end
+          @vars[:return_code] = ret
         end
-        unless ENV.has_key?('BUILD_STORE')
-          @vars[:build_store] = File.join(ENV['WORKSPACE'],'latest')
-        end
-        @vars[:build_ext]   = 'tar.bz2'
-        @vars[:build_pkg]   = File.join(local['artifacts'],@vars[:build_rel]+".#{@vars[:build_ext]}")
-        [ :build_chk, :build_mff, :build_mdf ].each do |file|
-          @vars[file] = File.join(local['artifacts'],File.basename(@vars[file]))
-        end
-        @vars[:latest_pkg]= "#{@vars[:build_store]}/#{@vars[:build_rel]}.#{@vars[:build_ext]}"
-
-        artifacts = []
-        scripts_glob = File.join(ENV['WORKSPACE'],ENV['REPO_DIR'], 'scripts','*')
-        Dir.glob(scripts_glob).each do |script|
-          key    = "#{@vars[:project_name]}/#{@vars[:variant]}/#{@vars[:build_nam]}/#{File.basename(script)}"
-          # Store the artifact - be sure to inherit possible overrides in pkg name and ext but dictate the drawer!
-          artifacts << {
-              key:        key,
-              data:       {:file => script},
-          }
-        end
-        @vars[:artifacts] = artifacts
-        ret = getLatest()
-        @vars[:return_code] = ret
-      end
 
-      # ---------------------------------------------------------------------------------------------------------------
-      def packageBuild()
-        # excludes=%w(*.iml *.txt *.sh *.md .gitignore .editorconfig .jshintrc *.deprecated adminer doc)
-        # excludes = excludes.map{ |e| "--exclude=#{@vars[:build_nam]}/#{e}" }.join(' ')
-        raise "Not in WORKSPACE?" unless Dir.pwd == ENV['WORKSPACE']
-
-        Dir.chdir ENV['REPO_DIR']
-        if Dir.pwd == File.join(ENV['WORKSPACE'], ENV['REPO_DIR'])
-          cmd = %(tar jcvf #{@vars[:build_pkg]} #{ENV['REPO_PARTS']} 2>&1)
-          @logger.info cmd
-          logger_info = %x(#{cmd})
-          ret = $?.exitstatus
-          @logger.info logger_info
-          lines = logger_info.split("\n").map{ |line| line.split(/\s+/)[1] }
-          IO.write @vars[:build_mff], lines.join("\n")
-          FileUtils.rmtree(@vars[:build_dir])
-          unless ret == 0
-            FileUtils.rm_f(@vars[:build_mff])
+        # ---------------------------------------------------------------------------------------------------------------
+        def packageBuild()
+          @logger.step __method__.to_s
+          # excludes=%w(*.iml *.txt *.sh *.md .gitignore .editorconfig .jshintrc *.deprecated adminer doc)
+          # excludes = excludes.map{ |e| "--exclude=#{@vars[:build_nam]}/#{e}" }.join(' ')
+
+          if isSameDirectory(Dir.pwd, ENV['WORKSPACE'])
+            Dir.chdir ENV['REPO_DIR']
+            if isSameDirectory(Dir.pwd, File.join(ENV['WORKSPACE'], ENV['REPO_DIR']))
+              if ENV.has_key?('REPO_PARTS') and not ENV['REPO_PARTS'].empty?
+                cmd = %(tar jcvf #{@vars[:build_pkg]} #{ENV['REPO_PARTS']} 2>&1)
+                @logger.info cmd
+                logger_info = %x(#{cmd})
+                @vars[:return_code] = $?.exitstatus
+                if @vars[:return_code] == 0
+                  @logger.debug logger_info
+                  lines = logger_info.split("\n").map { |line| line.split(/\s+/)[1] }
+                  begin
+                    unless IO.write(@vars[:build_mff], lines.join("\n")) > 0
+                      @logger.error "Nothing was written to manifest '#{@vars[:build_mff]}'"
+                      @vars[:return_code] = Errors::MANIFEST_EMPTY
+                    end
+                  rescue Exception => e
+                    @logger.error "Failed to write manifest: #{e.class.name} #{e.message} ('#{@vars[:build_mff]}')"
+                    @vars[:return_code] = Errors::MANIFEST_WRITE
+                  end
+                  FileUtils.rmtree(@vars[:build_dir])
+                else
+                  @logger.error "Failed to package '#{@vars[:build_pkg]}': #{logger_info}"
+                end
+                unless @vars[:return_code] == 0
+                  @logger.warn "Remove manifest '#{@vars[:build_mff]}' due to error"
+                  FileUtils.rm_f(@vars[:build_mff])
+                end
+              end
+            else
+              @logger.error "Cannot change into '#{ENV['REPO_DIR']}' directory"
+              @vars[:return_code] = Errors::REPO_DIR
+            end
+          else
+            @logger.error "Not in WORKSPACE? '#{pwd}' does not match WORKSPACE='#{workspace}'"
+            @vars[:return_code] = Errors::WORKSPACE_DIR
           end
-          ret
-        else
-          raise "Cannot change into '#{ENV['REPO_DIR']}' directory"
+
+          @vars[:return_code]
         end
       end
-
     end
 
   end
-end
+end

data/lib/cicd/builder/chefrepo/version.rb

@@ -6,7 +6,7 @@ module CiCd
       #   remove_const c if const_defined?(c)
       # end
 
-      VERSION  = '0.9.20'
+      VERSION  = '0.9.22'
       MAJOR, MINOR, TINY = VERSION.split('.')
       PATCH = TINY
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chefrepo-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.22
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cicd-builder
@@ -42,58 +42,82 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 description: Jenkins builder task for Chef repo CI/CD
 email: rubygems@dldinternet.com
 executables:
@@ -104,6 +128,7 @@ files:
 - ".gitignore"
 - ChangeLog.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - LICENSE.txt
 - README.md