rummager 0.5.3 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16d898882e16fff98a44d7fb1337cecea686894f
-  data.tar.gz: e4ced1135eeaf4be86843c30e14cc43fcc9e67bb
+  metadata.gz: 863bf28b028cfdb7b01552a33f50f8646abf16be
+  data.tar.gz: 2a702ec6012cbcb865dab98a8e2d7fdc951146c4
 SHA512:
-  metadata.gz: b0c82166972288d407cb0c1c0518758ef421245cb063500aa74be18373506227958267a99b3743e464a5af69ca1c8d3c77f30e9c1aa136285f7d34718fe89485
-  data.tar.gz: 6b806770648f370378f580ca686109382720d55322efe84bcb92b2c8555a664389722738f04813435d2716481e0d7204baf65a1fda0949c3e0cdeae3040265d8
+  metadata.gz: 948dc6526647190bc651c888feb6fd11a2a7a3c531bd92c59d8f55e64a71caed209434e7f06b24083ee430b65398980da83053a0eda70ec08e685623710ae6d0
+  data.tar.gz: bc2d200c9b8395c99b6770e8961800ffa38ec5c430001bceb9c39a5f3a3663f3210a84c0990c81e4b2a47dffa9ab86525ec83c80175ea0f012922a267a71b62b

data/lib/rummager/containers.rb

@@ -244,6 +244,7 @@ module Rummager
   class ClickContainer < Rake::TaskLib
     attr_accessor :container_name
     attr_accessor :image_name
+    attr_accessor :image_nobuild
     attr_accessor :repo_base
     attr_accessor :command
     attr_accessor :args_create
@@ -262,6 +263,7 @@ module Rummager
     def initialize(container_name,args={})
       @container_name = container_name
       @image_name = args.delete(:image_name) || container_name
+      @image_nobuild = args.delete(:image_nobuild)
       @repo_base = args.delete(:repo_base) || Rummager.repo_base
       @command = args.delete(:command)
       @args_create = args.delete(:args_create) || CNTNR_ARGS_CREATE
@@ -297,7 +299,13 @@ module Rummager
           realcreatetask.args_create = @args_create
           realcreatetask.command = @command
           realcreatetask.exposed_ports = @exposed_ports
-          Rake::Task["containers:#{@container_name}:create"].enhance( [ :"images:#{@image_name}:build" ] )
+          
+          if @image_nobuild == true
+            puts "skipping image build - assuming it exists" if Rake.verbose == true
+          else
+            Rake::Task["containers:#{@container_name}:create"].enhance( [ :"images:#{@image_name}:build" ] )
+          end
+          
           if @dep_jobs
             @dep_jobs.each do |dj|
               Rake::Task["containers:#{@container_name}:create"].enhance( [ :"#{dj}" ] )
@@ -314,31 +322,43 @@ module Rummager
           starttask.publishall = @publishall
           starttask.exec_on_start = @exec_on_start
           
+          # ensure that containers from which volumes will be attached
+          # are started before this container is started, otherwise
+          # docker volumes_from will fail
           Rake::Task["containers:#{@container_name}:start"].enhance( [ :"containers:#{@container_name}:create" ] )
           if @volumes_from
             @volumes_from.each do |vf|
               Rake::Task["containers:#{@container_name}:create"].enhance([:"containers:#{vf}:start" ])
             end
           end
+
+          # stop task
+          stoptask = Rummager::ContainerStopTask.define_task :stop
+          stoptask.container_name = @container_name
+          Rake::Task[:"containers:stop"].enhance( [ :"containers:#{@container_name}:stop" ] )
+
+          # enter task
           if @allow_enter
             # build and jump into an environment
             entertask = Rummager::ContainerEnterTask.define_task :enter
             entertask.container_name = @container_name
+            Rake::Task["containers:#{@container_name}:enter"].enhance([ :"containers:#{@container_name}:start" ])
+            # wire in any jobs marked as required to enter
+            # jobs must be defined on this container
             @enter_dep_jobs.each do |edj|
               Rake::Task["containers:#{@container_name}:enter"].enhance([ :"containers:#{@container_name}:jobs:#{edj}" ])
             end
-            Rake::Task["containers:#{@container_name}:enter"].enhance([ :"containers:#{@container_name}:start" ])
           end # allow_enter
-
-          # stop task
-          stoptask = Rummager::ContainerStopTask.define_task :stop
-          stoptask.container_name = @container_name
-          Rake::Task[:"containers:stop"].enhance( [ :"containers:#{@container_name}:stop" ] )
           
           # Remove task
           rmtask = Rummager::ContainerRMTask.define_task :rm
           rmtask.container_name = @container_name
-          Rake::Task["images:#{@image_name}:rmi"].enhance( [ "containers:#{@container_name}:rm" ] )
+          if @image_nobuild == true
+            puts "skipping #{@image_name}:rmi dependency on #{@container_name}:rm" if Rake.verbose == true
+          else
+            Rake::Task["images:#{@image_name}:rmi"].enhance( [ "containers:#{@container_name}:rm" ] )
+          end
+          
           Rake::Task["containers:#{@container_name}:rm"].enhance( [ :"containers:#{@container_name}:stop" ] )
           
           if @noclean == true
@@ -360,20 +380,33 @@ module Rummager
   class ContainerExecTask < Rummager::ContainerTaskBase
     attr_accessor :exec_list
     attr_accessor :ident_hash
+    attr_accessor :needed_test
 
     def ident_filename
       "/.once-#{@ident_hash}"
     end
 
     def needed?
-      if ! @ident_hash.nil?
-        puts "checking for #{ident_filename} in container"
+      if ! @needed_test.nil?
+        puts "running needed_test '#{needed_test}' in '#{@container_name}'" if Rake.verbose == true
+        begin
+            return_arry = docker_obj.exec(@needed_test)
+          puts "test '#{needed_test}' => '#{return_arry[0]}':#{return_arry[2]}"  if Rake.verbose == true
+          return (0 == return_arry[2])
+        rescue => ex
+          puts "test '#{needed_test}' failed in '#{@container_name}':#{ex.message}"
+          return false
+        end
+      elsif ! @ident_hash.nil?
+        puts "checking for #{ident_filename} in container" if Rake.verbose == true
         begin
           docker_obj.copy("#{ident_filename}")
           return false
         rescue
-          puts "#{ident_filename} not found"
+          puts "#{ident_filename} not found" if Rake.verbose == true
         end
+      else
+        puts "neither @needed_test nor @ident_hash defined for #{@task_name}" if Rake.verbose == true
       end
       # no ident hash, or not found
       true
@@ -418,6 +451,7 @@ module Rummager
     attr_accessor :job_name
     attr_accessor :container_name
     attr_accessor :exec_list
+    attr_accessor :needed_test
     attr_accessor :ident_hash
     attr_accessor :dep_jobs
     
@@ -434,6 +468,7 @@ module Rummager
       end
       @exec_list = args.delete(:exec_list)
       @dep_jobs = args.delete(:dep_jobs)
+      @needed_test = args.delete(:needed_test)
       if !args.empty?
         raise ArgumentError, "ClickExec'#{@job_name}' defenition has unused/invalid key-values:#{args}"
       end
@@ -452,6 +487,7 @@ module Rummager
             exectask.container_name = @container_name
             exectask.exec_list = @exec_list
             exectask.ident_hash = @ident_hash
+            exectask.needed_test = @needed_test
             Rake::Task[:"containers:#{@container_name}:jobs:#{job_name}"].enhance( [:"containers:#{@container_name}:start"] )
             if @dep_jobs
                 @dep_jobs.each do |dj|

data/lib/rummager/images.rb

@@ -133,7 +133,7 @@ class Rummager::ImageRMITask < Rummager::ImageTaskBase
   def initialize(task_name, app)
     super(task_name,app)
     @actions << Proc.new {
-      puts "removing image '#{t.repo}'" if Rake.verbose == true
+      puts "removing image '#{@repo}'" if Rake.verbose == true
       Docker::Image.all(:all => true).each do |img|
         if img.info['RepoTags'].any? { |s| s.include?(@repo) }
           begin

data/lib/rummager/util.rb

@@ -1,39 +1,52 @@
 module Rummager
 
+    def Rummager.cmd_shexec(cmdstring)
+        {
+            :cmd=> [ "/bin/sh","-c", cmdstring ],
+        }
+    end # cmd_bashexec
+
+    def Rummager.cmd_bashexec(cmdstring)
+        {
+            :cmd=> [ "/bin/bash","-c", cmdstring ],
+        }
+    end # cmd_bashexec
+
     def Rummager.cmd_gitmirror(filepath,giturl)
         {
             :cmd=> [ "/bin/bash","-c",
-            "if [[ -d #{filepath} ]]; then\n"                       \
-            "  /usr/bin/git --git-dir=#{filepath} fetch --all\n"    \
-            "else\n"                                                \
-            "  /usr/bin/git clone --mirror #{giturl} #{filepath}\n" \
-            "fi\n"],
+                "if [[ -d #{filepath} ]]; then\n"                       \
+                "  /usr/bin/git --git-dir=#{filepath} fetch --all\n"    \
+                "else\n"                                                \
+                "  /usr/bin/git clone --mirror #{giturl} #{filepath}\n" \
+                "fi\n"
+            ],
         }
-    end # mirror_or_update
+    end # cmd_gitmirror
 
     def Rummager.cmd_gitupdate(filepath)
         {
             :cmd=> [ "/bin/bash","-c",
-            "/usr/bin/git --git-dir=#{filepath} fetch --all",
+                "/usr/bin/git --git-dir=#{filepath} fetch --all",
             ],
         }
     end # cmd_gitupdate
 
     def Rummager.cmd_gitclone(branch,srcpath,clonepath)
         {
-            :cmd => ["/bin/sh","-c",
-            "/usr/bin/git clone --branch #{branch} #{srcpath} #{clonepath}"
+            :cmd => ["/bin/bash","-c",
+                "/usr/bin/git clone --branch #{branch} #{srcpath} #{clonepath}"
             ],
         }
     end # cmd_gitclone
 
     def Rummager.cmd_gitcheckout(commithash,srcpath,clonepath)
         {
-            :cmd => ["/bin/sh","-c",
-            "/usr/bin/git clone --no-checkout #{srcpath} #{clonepath}\n"  \
-            "/usr/bin/git --work-tree #{clonepath} --git-dir #{clonepath}/.git checkout #{commithash}\n"
+            :cmd => ["/bin/bash","-c",
+                "/usr/bin/git clone --no-checkout #{srcpath} #{clonepath} &&"  \
+                "/usr/bin/git --work-tree #{clonepath} --git-dir #{clonepath}/.git checkout #{commithash}\n"
             ],
         }
-    end # cmd_gitclone
+    end # cmd_gitcheckout
 
 end # Rummager

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rummager
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.9
 platform: ruby
 authors:
 - y3ddet, ted@xassembly.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake