bricky 0.0.21 → 0.0.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTUwZjhlYzE5Yzc2OGM5N2JhOGNmOThlZWFiYzVkOTVhNGZkNjc3NA==
+    MzkxMWM0NDVkZDUzNjU4ZWU2NjRlNWJhYTg1OTA1MzdjMzliMjUzNw==
   data.tar.gz: !binary |-
-    ZDk2ZGYyOTNiNzU3ZjQwZTZkMjE0YWE3N2QzM2FmNzk1N2EyYzgxNw==
+    OWEzMzRkMjc3MTFjZDI5ZDQxMjJhYzI5MmUxMjdlNjNkMzFmODU0YQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWI0MTE3MzA0YWUxMTMwZmU1OGIzNDI1ZmJjYThiM2U0NGZmNzQ2YWQ3ZjA4
-    NWY4ZTY5ODI5OTZiYzE5MGFiNmVlY2RiNWQzN2QxMjgyMGRjZGI3ODNkM2Fm
-    MTFmMzExNWIwZjhiMDRiN2I4NjUwMWYyYThhNDk4MjMzZjJjZmY=
+    ZTc1Y2Q3ODc2MDZmYTI0MzY2MTI0YzkzZmU4NzE1YjBkNjZiMTA4N2ZkNDUw
+    MjI1NmY0OTJiZTkwMjNlYzJlYmJkMDkxNGIzNTY5YjIzOGQ5NDM2NWNiMzdk
+    MDZlMTg2MWVjZmY5ODFiYWNlNTVjMDY5ZTYzOTgwZGI2Y2NkMWI=
   data.tar.gz: !binary |-
-    MGM2NWQ2YTA3NDZjNGY1NGJlNmU4ZTMyOWQ2NGU2NDMwZDM2MmVhMWZlNzJh
-    YmZlN2I4YzQ4YzZlNzc1NGFjMTY3ZDdiYTFkNjIwNTFjMzVkYjEwYWNiNDAy
-    M2FjYTg4MmMzMTBmZWU3Y2RmN2I3MDZlMDExOTkxNmUzYTgyOGE=
+    ZjljMDBkZjIzNjhhOWJjNDY0YjM0YTNkOGJmOWFjNGZiYzhlMTc1NDNkMGRh
+    YzcxNzRlZWNmNjExZjYyM2M2YmRjZDEzMGFiMzdmOWUxZjRiMGY0OTZjZTli
+    ZTRhOTZkMmZkMjY1MTYxOTdmZGVkMTU5Mjg4N2U2MjY2M2IxNTA=

data/lib/bricky/bricks/base.rb

@@ -16,6 +16,9 @@ module Bricky
       def environments
       end
 
+      def bootstrap(bootstrap_path)
+      end
+
       private
         def bricks_path
           Bricky.config.shim_path

data/lib/bricky/bricks/debian.rb

@@ -1,16 +1,37 @@
+require 'digest'
+
 module Bricky
   module Bricks
     class Debian < Base
       def arguments
-        builded_path = ENV.fetch('PACKAGE_OUTPUT_PATH', File.expand_path(config["build"]))
+        builded_path = File.expand_path(ENV.fetch('PACKAGE_OUTPUT_PATH', config['build']))
         scripts_path = "#{bricks_path}/debian"
 
         %W(-v #{builded_path}:/builded
            -v #{scripts_path}:/bricks/debian)
       end
-  
+
       def entrypoint
-        "/bricks/debian/builder" 
+        "/bricks/debian/builder"
+      end
+
+      def bootstrap(bootstrap_path)
+        if config.fetch('dependencies', false)
+          src = File.expand_path('debian/control')
+          dest = "#{bootstrap_path}/control"
+
+          FileUtils.cp(src, dest) unless skip_cached_file(src, dest)
+          ["COPY control /tmp/control", "RUN yes | mk-build-deps --install /tmp/control"]
+        end
+      end
+
+      private
+      def skip_cached_file(src, dest)
+        return false if not File.exists?(dest)
+
+        src_digest = Digest::SHA256.file(src).hexdigest
+        dest_digest = Digest::SHA256.file(dest).hexdigest
+        not src_digest.eql?(dest_digest) ? false : true
       end
     end
   end

data/lib/bricky/commands/bootstrap.rb

@@ -1,5 +1,6 @@
 require "etc"
 require "fileutils"
+require "bricky/bricks"
 
 module Bricky
   module Commands
@@ -16,7 +17,7 @@ module Bricky
 
           [base, hack].each do |code|
             logger.message "Processing '#{image.name}' image: ", code
-            
+
             unless Bricky::Executor.popen("builder", code)
               logger.failure "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~"
               return false
@@ -35,8 +36,8 @@ module Bricky
         end
 
         def create_hack_image(image)
-          hack_path = FileUtils::mkdir_p("#{Bricky.config.tmp_path}/patch/").first
-          File.open("#{hack_path}/Dockerfile", "w") { |file| file.write(parse_hack_template(image)) }
+          hacked_docker_image = parse_hack_template(image) + append_to_template
+          File.open("#{hack_path}/Dockerfile", "w") { |file| file.write(hacked_docker_image) }
           hack_path
         end
 
@@ -56,6 +57,18 @@ module Bricky
         def cache_file
           "#{Bricky.config.cache_path}/builder"
         end
+
+        def append_to_template
+          bricks.collect { |brick| brick.bootstrap(hack_path) }.flatten.join("\n")
+        end
+
+        def hack_path
+          FileUtils::mkdir_p("#{Bricky.config.tmp_path}/patch/").first
+        end
+
+        def bricks
+          @bricks ||= Bricky::Bricks.resolve
+        end
     end
   end
 end

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

metadata

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