bricky 0.0.37 → 0.0.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzAwOGYyZmU3OTBkNzRlN2M2ODJmMWMxMTA1YmYzOTYwNzdjOWYxNw==
+    YmY1ODgxMjA0ZTllMmFlOGFlODdiYmZkZGQ5ZGJjMWY4ZDFiMWQ4MA==
   data.tar.gz: !binary |-
-    M2ZkYWQ4YWQ3ZGY2YmQ4YTZiMmU4NDk4NTU0NjdiMGJjYzQ0MDlmNA==
+    OWMxMTUyMzM5YzllNjcwMmM2MzFkZDBiOGY2OWE4NGU2ODkyZDIxZg==
 SHA512:
   metadata.gz: !binary |-
-    MWU0MDI3MmUwYTE5OWNmMjliOTI5MWQ5N2Y4ZmNhYTk0MGU3NmQzNjNjNWNl
-    YmM0YWI5NmE5YmVmMzdlYjExYzQwYTM1NGU1MDcxOWE0OGQ4YzVjNjYxNWRk
-    ZGVkMDhiYTY0ZWM4NjhkYWU3MTA4MDhhMTU4YWZiYzZhZTMyNzk=
+    NWQ4ZTRiNzk0Y2UyNmVjNWJiY2QwNDY4MDUxMzBjN2VhODVlMzBjMmU5ZDkx
+    MTkzZDVhM2VkOWQxY2E1Zjc0ZmRiZjQ0NWRhMjUxZjE4MTQzMzVkM2VhODdl
+    MGJiZjI4MTI4OTJiYjM1MmMxMmYzMzJmOGJjM2U4ZTg1OWEyMjM=
   data.tar.gz: !binary |-
-    MmZhZmU0OGRjYTdhNjlhMmE3ZjU1NGZlZWUxYmY4NWFjMzE4MDI3YmNjMzRh
-    Njc1ODJmZjJhY2RjOTZjYjVlOTI1NzRiMmFlZWVhNmQzNmRkMzljZTJkZGIy
-    ZWEyNjZkZDAxOGZmZjMzYmI5MDU5YTA5ZjU2MTFjNDJjNjdiODc=
+    M2VmYjMwODBkODk5NmQ4ZDkxNTg4NDg5ZTg4ZWE0ODNkNmFmNzUzY2Q2OTg3
+    YzM2NmMzMTE0ODQ2Yzg0MGQ2NzdjNzg5OTg1NjA4MGI2OTg5YjA0MTgxMDc3
+    NDMzZTVjZjI2NTJkNzBiMmYxZDA3NWFiNTAyODBkMmMzYmQyNGE=

data/etc/bricks/mounts/builder

@@ -8,7 +8,7 @@ mounts() {
 
   pushd /bricks/mounts/volumes/
     echo $BRICKS_MOUNTS_IGNORE | tr ',' '\n' > /tmp/ignore-files
-    rsync -a --stats --exclude-from /tmp/ignore-files . /opt/workspace
+    rsync -a --stats -h --exclude-from /tmp/ignore-files . /opt/workspace
     chown -R builder. /opt/workspace
   popd
 }

data/etc/bricks/system/builder

@@ -1 +1,19 @@
 #!/bin/bash -e
+
+. $BRICKS_HOME/suexec
+
+system() {
+    info 'Executing custom commands'
+    local commands=$(echo $BRICKS_SYSTEM_COMMANDS | sed -e 's/;;/ /g')
+    
+    pushd /opt/workspace/source
+       for rawCommand in $commands
+       do
+           local command=$(echo $rawCommand | base64 -d)
+           echo "- $command"
+           $command
+       done
+    popd
+}
+
+execute system

data/lib/bricky/bricks/system.rb

@@ -1,3 +1,5 @@
+require "base64"
+
 module Bricky
   module Bricks
     class System < Base
@@ -8,6 +10,24 @@ module Bricky
           end
         end
       end
+
+      def arguments
+        ["-v #{bricks_path}/system:/bricks/system"]
+      end
+
+      def entrypoint
+        '/bricks/system/builder'
+      end
+
+      def environments
+        commands = config.fetch('builder', false)
+        commands.empty? ? nil : ["-e BRICKS_SYSTEM_COMMANDS='#{encode(commands)}'"]
+      end
+
+      private
+      def encode(commands)
+        commands.collect{|x| Base64.encode64(x).chomp}.join(';;')
+      end
     end
   end
 end

data/lib/bricky/commands/builder.rb

@@ -15,7 +15,7 @@ module Bricky
           code = command(images)
           logger.debug format(code)
           
-          unless Bricky::Executor.system(code)
+          unless executor.call(code)
             logger.failure '~~~~~~~~~~~ Problems building image ~~~~~~~~~~~'
             return false
           end
@@ -62,6 +62,14 @@ module Bricky
           FileUtils.safe_unlink(shim) if File.exist?(shim)
           FileUtils.symlink(Bricky.config.bricks_path, shim)
         end
+
+        def executor
+          if options['shell']
+            lambda { |command| Bricky::Executor.tty(command) }
+          else
+            lambda { |command| Bricky::Executor.system(command) }
+          end
+        end
     end
   end
 end

data/lib/bricky/executor.rb

@@ -16,6 +16,10 @@ module Bricky
       end
     end
 
+    def tty(command)
+      Kernel.system(command)
+    end
+
     private
       def execute(command)
         Open3.popen2e(command) do |input, output, wait|

data/lib/bricky/version.rb

@@ -1,4 +1,4 @@
 module Bricky
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
   CODENAME = "silver-surfer"
 end

metadata

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