bricky 0.0.17 → 0.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDIwZmI1NWIzZWI4NGEyZWEwZmM2ZjlmNDA0YWFkZjhhNjBmODQ5Nw==
+    MzlmNTdkMGM2N2ViMmEzNzE1ZjQ5NjUxYjE1ODU3ODNmYjc1MWI4Yg==
   data.tar.gz: !binary |-
-    ZWQ0ODMzODljMWMxNzFkYTA5NmQzZjVkNGIwZjkwNjNlNGU2NWM4Nw==
+    MjMxYTA1MzU0NWU4ZmM2ZWJjZDZmYzJhZTVkNTRmNzIwZWEzYjcwOA==
 SHA512:
   metadata.gz: !binary |-
-    NzQzNDM3MDkwODBhNDQyYjJlZmQ4OTk0MGI0ZTM5MWY2OTI2NmQ5MTc3ODE4
-    NDZlYmU1MmU3NTY3ODZiZmY4NmRmZjk2ZDA1ZmZhZDFlZDVhMDJiMzk2MWI1
-    OWVmMWY2N2E0MGZmNzhjODhlNmNmNzUxYzQ3NWYxNGI5YjkzZTg=
+    MGUwNTc4MmM5N2NmNGNhZGEyZmUxMDI3ZWRkNmVjOWUxZGJkYzBmYjE2ODc0
+    ZTI2Yjk0NTQ4ZmYzOGQyMDRiZDJiNzI5NGRjY2IwMGQ4MjI4MWU3NDhmMTg0
+    MTZkNDY0Yzg0NGY3ZjQ1MTRlYzM4OWIwNWE1M2UzNGM5N2I0MzI=
   data.tar.gz: !binary |-
-    YjcwODg2OGMxODNhYWExZTgzZjMwNGYzYmNhMzUxNzNiNzllNTQ3NDA1OWZk
-    ZDcwYzljNDMzMDA0MjBjMGI1MDhmMzZkYzYzNjc2ZjZhOGZkYzMxOWY4ZWU1
-    N2MwNDllODQ2NTFjZTQzZGY4MWQ5ODMxYjdiNDcyMGIzYzA1ODY=
+    MTIyYzlmYjNhMGM5OTViNGRiYWRiNDA3YTVkZmMyYzg5NTI4NTlmZGIyNmZh
+    ZGVlZDc4YzI3YjQyM2ExM2EzMzM4ZGE5MTUzNmQwYWZlNDllN2VjNzQ3Y2Y0
+    MmJiNGVhMjlhMjNiNjMyZTBmNzIwNWMxZDUzOTk3ZDc5Y2IyMTA=

data/etc/bricks/bundle/builder

@@ -1,4 +1,4 @@
-#!/bin/bash -le
+#!/bin/bash -e
 
 . $BRICKS_HOME/suexec
 
@@ -8,7 +8,7 @@ bundler() {
   info 'Vendor project with Bundler'
   pushd /opt/workspace/source
     command -v bundle > /dev/null 2>&1 || gem install --no-ri --no-rdoc bundler
-    bundle install --deployment --jobs 5 --without=$BRICKS_BUNDLE_WITHOUT
+    bundle install --deployment --without=$BRICKS_BUNDLE_WITHOUT
   popd
 }
 

data/etc/bricks/helper/start

@@ -1,4 +1,4 @@
-#!/bin/bash -le
+#!/bin/bash -e
 
 . $BRICKS_HOME/builder
 

data/etc/bricks/mounts/builder

@@ -1,4 +1,4 @@
-#!/bin/bash -le
+#!/bin/bash -e
 
 . $BRICKS_HOME/builder
 . $BRICKS_HOME/execute

data/lib/bricky/command.rb

@@ -19,9 +19,17 @@ module Bricky
 
     desc :builder, "build project"
     method_option :shell, :type => :boolean, :aliases => "-s"
+    method_option :debugger, :type => :boolean, :aliases => "-d"
+    method_option :"just-image", :type => :boolean, :aliases => "-i"
     def builder
+      Bricky.logger.level = Logger::DEBUG if options['debugger']
+
       requirements.check_and_execute do
-        dispatch(:bootstrap) && dispatch(:builder)
+        if options['just-image']
+          dispatch(:bootstrap)
+        else
+          dispatch(:bootstrap) && dispatch(:builder)
+        end
       end
     end
 

data/lib/bricky/commands/bootstrap.rb

@@ -6,12 +6,7 @@ module Bricky
     class Bootstrap < Base
       def execute
         logger.important "Boostraping images"
-
-        if need_rebuild?
-          build(image)
-        else
-          logger.message "Skipping bootstrap process"
-        end
+        build(image)
       end
 
       private
@@ -28,7 +23,6 @@ module Bricky
             end
           end
 
-          make_cache!
           true
         end
 
@@ -62,21 +56,6 @@ module Bricky
         def cache_file
           "#{Bricky.config.cache_path}/builder"
         end
-
-        def need_rebuild?
-          cache_digest = open(cache_file).read rescue "dummy"
-          image_digest = Digest::MD5.file(image.full_path).hexdigest
-
-          return false if cache_digest.eql?(image_digest)
-          true  
-        end
-
-        def make_cache!
-          FileUtils::mkdir_p(Bricky.config.cache_path)
-          open(cache_file, 'w') do |file|
-            file.write Digest::MD5.file(image.full_path).hexdigest
-          end
-        end
     end
   end
 end

data/lib/bricky/commands/builder.rb

@@ -14,9 +14,8 @@ module Bricky
           attach_shims
           code = command(images)
           logger.debug format(code)
-
-          # TODO: remove nil from executor popen
-          unless Bricky::Executor.popen(nil, code)
+          
+          unless Bricky::Executor.system(code)
             logger.failure '~~~~~~~~~~~ Problems building image ~~~~~~~~~~~'
             return false
           end
@@ -25,7 +24,8 @@ module Bricky
         end
 
         def command(image)
-          "docker run #{envs} #{arguments} -i -t #{image.name} /bricks/helper/start"
+          iteractive_hacks = options['shell'] ? "-i -t" : ""
+          "docker run --rm #{envs} #{arguments} #{iteractive_hacks} #{image.name} /bricks/helper/start"
         end
 
         def format(command)
@@ -54,9 +54,9 @@ module Bricky
         end
 
         def attach_shims
-          if not File.exist? Bricky.config.shim_path
-            FileUtils.symlink(Bricky.config.bricks_path, Bricky.config.shim_path)
-          end
+          shim = Bricky.config.shim_path
+          FileUtils.safe_unlink(shim) if File.exist?(shim)
+          FileUtils.symlink(Bricky.config.bricks_path, shim)
         end
     end
   end

data/lib/bricky/executor.rb

@@ -1,27 +1,14 @@
-require "pty"
+require "open3"
 
 module Bricky
   module Executor
     extend self
 
     def popen(label, command)
-      PTY.spawn(command) do |input, output, wait|
-        begin
-          # TODO: Refactory
-          input.each do |line|
-            if label.nil?
-              logger.info line.chomp
-            else
-              logger.normal label, ": #{line.chomp}"
-            end
-          end
-        rescue Errno::EIO
-        ensure
-          Process.wait wait
-        end
-      end
-
-      $?.exitstatus.to_i.eql?(0)
+      Open3.popen2e(command) do |input, output, wait|
+        output.each { |line| logger.normal label, ": #{line.chomp}" } 
+        wait.value.to_i.eql?(0)
+      end 
     end
 
     def system(command)
@@ -30,7 +17,7 @@ module Bricky
 
     private
       def logger
-        @logger ||= Bricky::Logger.new
+        Bricky.logger
       end
   end
 end

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler