bricky 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc3YzJiMTFhZWE0ZDg4Y2UwNWE3YTA2MmJlNWM0YWNlNzYzZDk1Yg==
+    MTQ2ODNjMDgwNWViODIxN2I3ZGM4ZWRlNjhhNDc0ZGJhYjA2YzY3Zg==
   data.tar.gz: !binary |-
-    NzYyM2M4NjQ5ZDg3OGQ0Yzk2NjI5NmMzZDJmZjNhMGYzYWNkYWE5NQ==
+    MzJjNjAxZGQ3OWI2YTc2Yzg1NDdlZTk5ZjgwYjEwNmZhYzU5ODU4Ng==
 SHA512:
   metadata.gz: !binary |-
-    ZWFmNTNiODJjMWRhNDljZTk3NzU3MmFiMjIyYTU3NWZiYzI5NWZhNzFkMzI4
-    ZTEyZjU4YjRiNzA3OWVhZWM0MDhmYjZlMzcxNGViYTQ4NDc1OTdmODA3YjJm
-    N2E4MDhiYTkzMzJhY2Y2MmY5ZDU0ZTRiYzZmOWY2YmZiOWQ2ZGE=
+    OGJmYWU3ZDlkNjQ1YTQxYjhhNzIyMDg1MDE2YmI5MTExN2Q4MjYxMDMwOTU4
+    NDQ5ZGE0YTlmN2I3MTA2YTMzNzg3ZjljM2ZiMjgwYjY5YTFhYjI2NGE5Mjhi
+    MDE1ZDM5Y2JjMzEwMWM3YTllODA3ODhjOTMyYTYwYjE2ZTFlOTU=
   data.tar.gz: !binary |-
-    YmYwYzlkZWZhYTQ3M2Y1YzllYTFiNzY3YmUxNWJlYzRhMzEyMjM4Y2JkYTNj
-    MGQ0NTQ4YzRmYTU3Mjg2MDY3NTc4NmI1ZDgzNTZiNjdkZmVlOTkyMWU2YmMx
-    OTBjZTlkMDI1ZWIyZjM5NWVhODc0ZTdjZGZmNDUxZTU0Y2ZiZjE=
+    MWIwODkwMWFmMTQwZDUzZTQ3ODViZDE1ZGI0YTQ4YjEzNmYyODgzNzk4OGQz
+    Zjg3OTAyYTI3OWYyMDJmODY5NTMwNzE3Nzg1OTBhYjg1ZmE4NTVmODE2OGE1
+    Njc4MjRkYmEyNDBmZDVlN2E5YzMxMjI5OTlmNDg1MjU4ZjA3M2Q=

data/etc/bricks/bundle/builder

@@ -8,7 +8,7 @@ execute() {
   info 'Vendor project with Bundler'
   pushd /opt/workspace/source
     gem install bundler --conservative --no-ri --no-rdoc
-    bundle install --deployment --without=development:test
+    bundle install --deployment --without=$BRICKS_BUNDLE_WITHOUT
   popd
 }
 

data/etc/hacker/id_container/Dockerfile

@@ -1,3 +1,3 @@
 FROM <%= self.image %>
-RUN useradd -u <%= self.uid %> builder
+RUN useradd -u <%= self.uid %> -m -d /home/builder builder
 RUN mkdir -p /opt/workspace && chown -R builder. /opt

data/etc/templates/bricky/bricky.yml

@@ -6,5 +6,6 @@ bricky:
       source: .
     bundle:
       cache: true
+      without: development:test
     debian:
       build: bricky/build

data/lib/bricky/bricks/base.rb

@@ -10,6 +10,9 @@ module Bricky
       def entrypoint
       end
 
+      def environments
+      end
+
       private
         def bricks_path
           Bricky.config.bricks_path

data/lib/bricky/bricks/bundle.rb

@@ -14,13 +14,17 @@ module Bricky
         "/bricks/bundle/builder"
       end
 
+      def environments
+        ["-e BRICKS_BUNDLE_WITHOUT=#{config.fetch('without', 'development:test')}"]
+      end
+
       private
         def cached
           ["-v #{local_path}:/opt/workspace/source/vendor/bundle"]
         end
 
         def local_path
-          path = "/tmp/bricky/cache/#{digest}"
+          path = "#{Bricky.config.tmp_path}/cache/#{digest}"
           FileUtils::mkdir_p(path)
           path
         end

data/lib/bricky/bricks/helper.rb

@@ -2,8 +2,11 @@ module Bricky
   module Bricks
     class Helper < Base
       def arguments
-        ["-v #{bricks_path}/helper:/bricks/helper",
-          "-e BRICKS_HOME=/bricks/helper"]
+        ["-v #{bricks_path}/helper:/bricks/helper"]
+      end
+
+      def environments
+        ["-e BRICKS_HOME=/bricks/helper"]
       end
     end
   end

data/lib/bricky/bricks.rb

@@ -11,9 +11,9 @@ module Bricky
     extend self
 
     def resolve
-       Bricky.config.bricks.collect do |name, config|
-        resolve_and_initialize(name, config)
-       end.uniq << Bricky::Bricks::Helper.new({})
+      default_bricks + Bricky.config.bricks.collect do |name, config|
+       resolve_and_initialize(name, config)
+      end.uniq
     end
 
     def resolve_and_initialize(name, config)
@@ -21,5 +21,10 @@ module Bricky
       return Bricky::Bricks::Debian.new(config) if name.eql? "debian"
       return Bricky::Bricks::Mounts.new(config) if name.eql? "mounts"
     end
+
+    private
+      def default_bricks
+        [Bricky::Bricks::Helper.new({})]
+      end
   end
 end

data/lib/bricky/commands/bootstrap.rb

@@ -37,7 +37,7 @@ module Bricky
         end
 
         def create_hack_image(image)
-          hack_path = FileUtils::mkdir_p("/tmp/bricky/containers/#{Bricky.config.name}").first
+          hack_path = FileUtils::mkdir_p("#{Bricky.config.tmp_path}/containers/#{Bricky.config.name}").first
           File.open("#{hack_path}/Dockerfile", "w") { |file| file.write(parse_hack_template(image)) }
           hack_path
         end

data/lib/bricky/commands/builder.rb

@@ -25,14 +25,17 @@ module Bricky
 
         def command(image)
           bricks = Bricky::Bricks.resolve
+          envs = bricks.collect(&:environments).uniq.join(" ")
           arguments = bricks.collect(&:arguments).uniq.join(" ")
           entrypoints = bricks.collect(&:entrypoint).compact.uniq.join(" && ")
 
-          "docker run #{arguments} -i -t #{image.name} /bin/bash -l -c '#{entrypoints}'"
+          "docker run #{envs} #{arguments} -i -t #{image.name} /bin/bash -l -c '#{entrypoints}'"
         end
 
         def format(command)
-          command.split("-v ").join("\n\t -v ").split("-i ").join("\n\t -i ")
+          ["-v ", "-i ", "-e "].inject(command) do |result, param|
+            result.split(param).join("\n\t #{param}")
+          end
         end
     end
   end

data/lib/bricky/config.rb

@@ -22,6 +22,10 @@ module Bricky
       File.expand_path("#{base_path}/etc/hacker", __FILE__)
     end
 
+    def tmp_path
+      "#{ENV['HOME']}/.bricky"
+    end
+
     private
       def base_path
         "../../.."

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: a new way to build and package applications