bricky 0.0.30 → 0.0.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg3YjMyNWIxN2IyZTBhZDJkZjk2ODg4OTZjYzE4N2YzODFhYzBiNg==
+    ZGUxZjIzMDY3MWNhODRkNzcwZDc4MDViYzE5OGZiYzRlNzkwZTcwNw==
   data.tar.gz: !binary |-
-    ZjdhYWUxM2Q3ZDg2MjQxNzg5YWMzMDZlZGY4NzRhYTJiYjUxMDdhMg==
+    OGFlMjE1ZDg4NDVhNzZmNzg2MzQ3OTM0ZDkwODAwYzBmM2Q4NzU4NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTdlMDc3YTA0MDE3ZWQzYThhMGE3OGZjZjQzNjY3NWYyMjRjYWExMmZkN2M0
-    YzA0YjE5ZDM1NzA0ZWNjYTY2YjI3ODg3NWY2YjNjMTQ0OGFlZjM2ZjM0OGE5
-    NDU5MmRlNTE4ZDQzYmRlNjI5ZGQwZWUzZmFiNDM5NDdhMWViYTg=
+    OGViZjI0N2QxMDJkODc4ZTI0NGMyMmEwZjlmNTBkNjNmNTRjZTljY2IyYzY3
+    YzVhNjlhMGI0NmNmZjE0NDRlMDE1ZGJhY2E1Mjg5NGU5MWNhNzdmMWI3NzNl
+    YTdkZGI5ODEyNGU5YjY4ODY3YjQ1YjZiOGU5NzVlMWU1YmFkYTQ=
   data.tar.gz: !binary |-
-    MzIzM2U0OGQxZjUzZmM3YjljY2EzZWI5ZmVhODc1YWVhNDYzYjQzOGE0Y2Mz
-    NTUwZDU0MzljMDg5OTE2YTQ5YTcwNDU2YWNjZDUzMjhjODlmNmRlZjI1MDEz
-    YWI5YmQ1YTZmYjEwMGVkY2ZmZDM0NzZmMTA0YTUxNWU3NmRhMzE=
+    MTA5ODY0ZmFlNmNiNWRjODZiZDIwY2RkZjc1MGNmMDdkYmEyMzhjZWE2Yzhm
+    MmIwNDM5MTMwOWI2YzIzODk0YjMzNGI5MDgxMDUzYTkwMjY1NzEyMjg3ZGIw
+    YzJkMjA5ZjZlZTAxMzc5Zjc5OGJmYzk3MTJmODViZThjMWU1ZTc=

data/etc/bricks/dotenv/builder

@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+. $BRICKS_HOME/builder
+. $BRICKS_HOME/execute
+
+dotenv() {
+  info 'Populating environment variables'
+
+  pushd /bricks/mounts/volumes/source
+    export $(cat $BRICKS_DOTENV_SOURCE_FILES | tr ',' ' ')
+    echo "From files: $BRICKS_DOTENV_SOURCE_FILES"
+  popd
+}
+
+execute dotenv

data/etc/bricks/helper/execute

@@ -16,8 +16,8 @@ stop_if_error() {
 }
 
 execute() {
-  function_name=$1
-  $function_name 2>&1 | label $function_name; stop_if_error
+    function_name=$1
+    $function_name > >(label $function_name) 2>&1
 }
 
 export -f label stop_if_error execute

data/etc/bricks/helper/start

@@ -1,13 +1,16 @@
 #!/bin/bash -e
 
 . $BRICKS_HOME/builder
+scripts=$(echo $BRICKY_ENTRYPOINTS | tr ',' ' ')
 
 builder() {
-  eval $BRICKY_ENTRYPOINTS
+    for bricky in $scripts
+    do
+        . $bricky
+    done
 }
 
 builder_source() {
-  scripts=$(echo $BRICKY_ENTRYPOINTS | tr " && " "\n")
   cat $scripts > /tmp/builderplan
   grep -v "bin/bash" /tmp/builderplan | more 
 }

data/etc/bricks/helper/suexec

@@ -20,6 +20,6 @@ execute_other() {
 }
 
 execute_linux() {
-  name=$1
-  su builder -m -c "bash -ec 'execute $name'"
+    name=$1
+    su builder -m -c "bash -ec 'execute $name'"
 }

data/etc/templates/bricky/bricky.yml

@@ -6,6 +6,9 @@ bricky:
       source: .
       ignore:
         - source/vendor/bundle
+    dotenv:
+      source:
+        - .env
     bundle:
       cache: true
       without: development:test

data/lib/bricky/bricks/dotenv.rb

@@ -0,0 +1,17 @@
+module Bricky
+  module Bricks
+    class Dotenv < Base
+      def entrypoint
+        "/bricks/dotenv/builder"
+      end
+
+      def arguments
+        ["-v #{bricks_path}/dotenv:/bricks/dotenv"]
+      end
+
+      def environments
+        ["-e BRICKS_DOTENV_SOURCE_FILES='#{config.fetch('source', []).join(',')}'"]
+      end
+    end
+  end
+end

data/lib/bricky/bricks.rb

@@ -5,6 +5,7 @@ require "bricky/bricks/ruby"
 require "bricky/bricks/rails"
 require "bricky/bricks/bundle"
 require "bricky/bricks/debian"
+require 'bricky/bricks/dotenv'
 require "bricky/bricks/mounts"
 require "bricky/bricks/version"
 

data/lib/bricky/commands/builder.rb

@@ -54,7 +54,7 @@ module Bricky
         end
 
         def entrypoints
-          bricks.collect(&:entrypoint).compact.uniq.join(' && ')
+          bricks.collect(&:entrypoint).compact.uniq.join(',')
         end
 
         def attach_shims

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - bin/bricky
 - etc/bricks/bundle/builder
 - etc/bricks/debian/builder
+- etc/bricks/dotenv/builder
 - etc/bricks/helper/builder
 - etc/bricks/helper/execute
 - etc/bricks/helper/start
@@ -107,6 +108,7 @@ files:
 - lib/bricky/bricks/base.rb
 - lib/bricky/bricks/bundle.rb
 - lib/bricky/bricks/debian.rb
+- lib/bricky/bricks/dotenv.rb
 - lib/bricky/bricks/helper.rb
 - lib/bricky/bricks/mounts.rb
 - lib/bricky/bricks/rails.rb