construi 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNjNzhlY2M0MzIxM2I3YTY1MjA1MGRhZjIxOTlkZWVkN2ZhNDQ3ZA==
+    NzNjNDkwNGM3OWI0ZTVhNjgzYzY0ODg5NDkyOGQ2MWNjMGM0ZDE3NA==
   data.tar.gz: !binary |-
-    NTZkMDM3MjU4M2M3NmI0YzkxODUxMmIwZTNmZWRkYTAwMWMzYTlkMA==
+    ZTZkYmJjMDI3ZDI5YWIzYTQ2ZTlhOTgxYTIyMTJkNTg5MzY0ZTg3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NTYwNzE3ODVlNGM4MWUzYjUzYjBmN2ZiMzI5Y2NkMGI0MDMwZjQ2M2FlM2Vk
-    Y2U3YTc3NzUwOWU5MGNlZmFhY2NmNDdhNWY0N2IyNDAwOTk3ODFhY2VjZmRm
-    NWZjN2QyNDJhNjc4ZGNjNGNkYzljNzgzMjY1M2VkNDNkOTliN2Q=
+    YmY5NzhjMzRiN2FkMzMyYmNkYWJkY2UyZWE0NDMzODkwNDJlYTE3NDVjNWNi
+    NTBiMzAyNDc4YTlmNDdkMTJiN2NjMjkxNWU1OTg3ZGMxZTkwZGI2Yjc2YTVl
+    MzczNjU5MzZlNDhkNjE5NjNmZGE1YTNkNThlODc1OGZiZmQyN2Q=
   data.tar.gz: !binary |-
-    MDY2YzY5OGFlZDgzMzRiNWM3YTA0ZTg5YWQzMTRmZDdjYTRlY2Y2MzAzYjRl
-    MTY4MmMzZTYyNTU5M2UwZmE3OTI1Yjk3ODgyZDhmYjYyYTQ5MGNiYTA0N2E5
-    NGUwYmViYzcxZmU1YTA5OGNmNTE0Y2Y0NWFhNWVlZDYxZjBkMGE=
+    YThjODY0Yjg2ZTMyNGZmYmM2MGNjMGUyNmQ5YmIxYjIyNTQ2ZDAwMDk4ODNk
+    YzVhYTQxODExOWY0YjY5NGM4NDM1MDE4YWIxZWI4M2RlNTc1MzEwYjc5NTYy
+    Yjc3ZjI5YTE1M2IyMWVlN2JhYjVhNTEyYmRjMDVkNmU4ODM1MmE=

data/construi.yml

@@ -1,6 +1,15 @@
 image: ruby:1.9
 
+environment:
+  - CODECLIMATE_REPO_TOKEN
+  - COVERALLS_TOKEN
+
 targets:
   build:
     - bundle install --path=vendor/bundle
     - bundle exec rake spec
+
+  install:
+    - bundle install --path=vendor/bundle
+    - bundle exec rake install
+

data/lib/construi.rb

@@ -1,6 +1,7 @@
 require 'construi/config'
 require 'construi/container'
 require 'construi/image'
+require 'construi/version'
 
 require 'docker'
 require 'yaml'
@@ -13,6 +14,8 @@ module Construi
     end
 
     def run(targets)
+      puts "Construi version: #{Construi::VERSION}"
+
       docker_host = ENV['DOCKER_HOST']
       Docker.url = docker_host unless docker_host.nil?
 
@@ -29,7 +32,7 @@ module Construi
 
       final_image = commands.reduce(IntermediateImage.seed(initial_image)) do |image, command|
         puts "Running command: #{command}"
-        image.run(command)
+        image.run(command, @config.env)
       end
 
       final_image.delete

data/lib/construi/config.rb

@@ -18,6 +18,18 @@ module Construi
       @yaml['image']
     end
 
+    def env
+      @yaml['environment'].reduce([]) do |acc, e|
+        key = e.partition('=').first
+        value = e.partition('=').last
+
+        value = ENV[key] if value.empty?
+
+        acc << "#{key}=#{value}" unless value.nil? or value.empty?
+        acc
+      end
+    end
+
     def target(target)
       Target.new(@yaml['targets'][target])
     end

data/lib/construi/container.rb

@@ -34,10 +34,11 @@ module Construi
       commit
     end
 
-    def self.create(image, cmd)
+    def self.create(image, cmd, env)
       wrap Docker::Container.create(
         'Cmd' => cmd.split,
         'Image' => image.id,
+        'Env' => env.to_json,
         'Tty' => false,
         'WorkingDir' => '/var/workspace',
         'HostConfig' => { 'Binds' => ["#{Dir.pwd}:/var/workspace"] })
@@ -47,15 +48,15 @@ module Construi
       new container
     end
 
-    def self.use(image, cmd)
-      container = create(image, cmd)
+    def self.use(image, cmd, env)
+      container = create(image, cmd, env)
       yield container
     ensure
       container.delete unless container.nil?
     end
 
-    def self.run(image, cmd)
-      use(image, cmd, &:run)
+    def self.run(image, cmd, env)
+      use(image, cmd, env, &:run)
     end
 
   end

data/lib/construi/image.rb

@@ -21,8 +21,8 @@ module Construi
       @image.info['RepoTags'] != '<none>:<none>'
     end
 
-    def run(cmd)
-      Container.run(self, cmd)
+    def run(cmd, env)
+      Container.run(self, cmd, env)
     end
 
     def self.create(image)
@@ -50,8 +50,8 @@ module Construi
       @image = image
     end
 
-    def run(cmd)
-      map { |i| i.run(cmd) }
+    def run(cmd, env)
+      map { |i| i.run(cmd, env) }
     end
 
     def map

data/lib/construi/version.rb

@@ -1,3 +1,3 @@
 module Construi
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: construi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - lstephen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api