construi 0.37.0 → 0.38.0

data/construi/release/script.sh

@@ -11,17 +11,18 @@ release_commit=`git rev-parse HEAD`
 
 echo "Release commit ${release_commit}..."
 
+bundle install --path vendor/bundle
+
 echo "Pushing to master..."
 git push -f origin `git rev-parse HEAD`:master
 
 echo "Push to master done."
 
 echo "Updating development version..."
-bundle install --path vendor/bundle
 bundle exec gem bump --version minor
 
 echo "Pushing to develop..."
-git push origin `get rev-parse HEAD`:develop
+git push origin `git rev-parse HEAD`:develop
 echo "Push to develop done."
 
 echo "Release done."

data/lib/construi/container.rb

@@ -14,7 +14,7 @@ module Construi
     end
 
     def delete
-      @container.delete
+      @container.delete force: true, v: true
     end
 
     def attach_stdout

data/lib/construi/image.rb

@@ -4,7 +4,7 @@ require 'colorize'
 require 'docker'
 
 module Construi
-
+  # A Docker Image
   class Image
     private_class_method :new
 
@@ -28,7 +28,7 @@ module Construi
       @image.info['RepoTags'] != '<none>:<none>'
     end
 
-    def insert_local(file)
+    def insert_local(file, options = {})
       puts "\nCopying #{file.host} to #{file.container}...".green
 
       img = IntermediateImage.seed(self)
@@ -38,22 +38,25 @@ module Construi
           .insert_local 'localPath' => file.host, 'outputPath' => file.container
       end
 
-      img.map { |i| i.chmod file.container, file.permissions } if file.permissions
+      img.map { |i| i.chmod file.container, file.permissions, options } if file.permissions
 
-      img.run "ls -l #{file.container}"
+      img.run "ls -l #{file.container}", options
 
       img.image
     end
 
-    def insert_locals(files)
-      IntermediateImage.seed(self).reduce(files) { |i, f| i.insert_local f }.image
+    def insert_locals(files, options = {})
+      IntermediateImage
+        .seed(self)
+        .reduce(files) { |a, e| a.insert_local e, options }
+        .image
     end
 
-    def chmod(file, permissions)
-        chmod = "chmod -R #{permissions} #{file}"
+    def chmod(file, permissions, options = {})
+      chmod = "chmod -R #{permissions} #{file}"
 
-        puts " > #{chmod}"
-        run chmod
+      puts " > #{chmod}"
+      run chmod, options
     end
 
     def run(cmd, options = {})
@@ -61,16 +64,16 @@ module Construi
     end
 
     def ==(other)
-      other.is_a? Image and id == other.id
+      other.is_a?(Image) && id == other.id
     end
 
     def self.from(config)
       image = create(config.image) unless config.image.nil?
       image = build(config.build) unless config.build.nil?
 
-      raise Error, "Invalid image configuration: #{config}" unless image
+      fail Error, "Invalid image configuration: #{config}" unless image
 
-      image.insert_locals config.files
+      image.insert_locals config.files, privileged: config.privileged?
     end
 
     def self.create(image)
@@ -82,7 +85,7 @@ module Construi
         id = status['id']
         progress = status['progressDetail']
 
-        if progress.nil? or progress.empty?
+        if progress.nil? || progress.empty?
           print "#{id}: " unless id.nil?
           puts "#{status['status']}"
         end
@@ -92,7 +95,7 @@ module Construi
     def self.build(build)
       puts
       puts "Building image: '#{build}'...".green
-      wrap Docker::Image.build_from_dir(build, :rm => 0) { |s|
+      wrap Docker::Image.build_from_dir(build, rm: 0) { |s|
         puts JSON.parse(s)['stream']
       }
     end
@@ -105,6 +108,9 @@ module Construi
     end
   end
 
+  # An image that represents an intermediatae state of an image.
+  # Useful for performing operations where each opertion is performed on the
+  # result of the last.
   class IntermediateImage
     private_class_method :new
 
@@ -115,8 +121,8 @@ module Construi
       @first = true
     end
 
-    def run(cmd, env = [])
-      map { |i| i.run cmd, env: env }
+    def run(cmd, options = {})
+      map { |i| i.run cmd, options }
     end
 
     def map

data/lib/construi/version.rb

@@ -1,3 +1,3 @@
 module Construi
-  VERSION = "0.37.0"
+  VERSION = "0.38.0"
 end

data/spec/lib/construi/image_spec.rb

@@ -5,11 +5,15 @@ require 'securerandom'
 
 RSpec.describe Construi::Image do
   let(:id) {  SecureRandom.hex(16) }
-  let(:docker_image) { instance_double(Docker::Image, :id => id).as_null_object }
+
+  let(:docker_image) do
+    instance_double(Docker::Image, id: id).as_null_object
+  end
+
   let!(:docker_image_class) { class_spy(Docker::Image).as_stubbed_const }
   let!(:container_class) { class_spy(Construi::Container).as_stubbed_const }
 
-  let(:default_options) { { env: [] } }
+  let(:default_options) { {} }
 
   subject(:image) { Construi::Image.wrap(docker_image) }
 
@@ -24,7 +28,9 @@ RSpec.describe Construi::Image do
   end
 
   describe '#tagged?' do
-    before { allow(docker_image).to receive(:info).and_return({ 'RepoTags' => tag }) }
+    before do
+      allow(docker_image).to receive(:info).and_return('RepoTags' => tag)
+    end
 
     subject { image.tagged? }
 
@@ -53,9 +59,15 @@ RSpec.describe Construi::Image do
     let(:host) { '/path/host' }
     let(:container) { '/path/on/container' }
     let(:permissions) { nil }
-    let(:file) { Construi::Config::Files::File.new host, container, permissions }
 
-    before { allow(docker_image).to receive(:info).and_return({ 'RepoTags' => '<none>:<none>' }) }
+    let(:file) do
+      Construi::Config::Files::File.new host, container, permissions
+    end
+
+    before do
+      allow(docker_image).to receive(:info).and_return('RepoTags' => '<none>:<none>')
+    end
+
     before { allow(docker_image).to receive(:insert_local).and_return(docker_image) }
     before { allow(container_class).to receive(:run).and_return image }
 
@@ -92,12 +104,17 @@ RSpec.describe Construi::Image do
   end
 
   describe '.from' do
-    Config = Struct.new :image, :build, :files
+    let(:config) { instance_double(Construi::Config::Environment).as_null_object }
 
     let(:image) { nil }
     let(:build) { nil }
     let(:files) { [] }
-    let(:config) { Config.new image, build, files }
+    let(:privileged?) { false }
+
+    before { allow(config).to receive(:image).and_return image }
+    before { allow(config).to receive(:build).and_return build }
+    before { allow(config).to receive(:files).and_return files }
+    before { allow(config).to receive(:privileged?).and_return privileged? }
 
     [:create, :build_from_dir].each do |m|
       before { allow(docker_image_class).to receive(m).and_return docker_image }
@@ -229,25 +246,22 @@ RSpec.describe Construi::IntermediateImage do
 
   describe '#run' do
     let(:cmd) { 'cmd1' }
-    let(:env) { ['VAR1=VALUE1'] }
+    let(:options) { { env: ['VAR1=VALUE1']} }
 
     context "single run" do
-      subject! { intermediate_image.run(cmd, env) }
+      subject! { intermediate_image.run(cmd, options) }
 
-      it { expect(image).to have_received(:run).with(cmd, env: env) }
+      it { expect(image).to have_received(:run).with(cmd, options) }
       it { expect(image).to_not have_received(:delete) }
       it { expect(second_image).to_not have_received(:delete) }
     end
 
     context "double run" do
-      subject! { intermediate_image.run(cmd, env).run(cmd, env) }
+      subject! { intermediate_image.run(cmd, options).run(cmd, options) }
 
-      it { expect(second_image).to have_received(:run).with(cmd, env: env) }
+      it { expect(second_image).to have_received(:run).with(cmd, options) }
       it { expect(second_image).to have_received(:delete) }
     end
   end
-
-
-
 end
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: construi
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
+  prerelease: 
 platform: ruby
 authors:
 - Levi Stephen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,155 +46,177 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.31'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.31'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Build tool using Docker to specify build environment
@@ -200,8 +227,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -236,26 +263,30 @@ files:
 homepage: https://github.com/lstephen/construi
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3908895756660741766
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Build tool using Docker to specify build environment
 test_files:
 - spec/lib/construi/config_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 94c464f6d921f079a8cb7c7c89ca5937ead50759
-  data.tar.gz: e18328c8283dc1c6df7572c951fcd756f640a15d
-SHA512:
-  metadata.gz: 4b773069990d7e2465736d372f91a6d363aa3bb93cea7a0381a2ac06f48f4ef074a1aaa0547f927f8ece9a1e9ae06958126a8a09856128d1ed22862f782de4a6
-  data.tar.gz: 5a7e38bce29e2cd0abc02bee3c2695dbe029357b088431c64a0ab0599832c15f183c8285772fbbbf982e85f539de772c82d2fcce142828666c8c2730e7037f0e