construi 0.35.2 → 0.36.0

data/spec/lib/construi/image_spec.rb

@@ -9,6 +9,8 @@ RSpec.describe Construi::Image do
   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: [] } }
+
   subject(:image) { Construi::Image.wrap(docker_image) }
 
   describe '#id' do
@@ -42,9 +44,9 @@ RSpec.describe Construi::Image do
     let(:env) { ['VAR1=VALUE1'] }
     let!(:container) { class_spy(Construi::Container).as_stubbed_const }
 
-    subject! { image.run(cmd, env) }
+    subject! { image.run(cmd, env: env) }
 
-    it { expect(container).to have_received(:run).with(image, cmd, env) }
+    it { expect(container).to have_received(:run).with(image, cmd, env: env) }
   end
 
   describe '#insert_local' do
@@ -66,7 +68,7 @@ RSpec.describe Construi::Image do
           .to have_received(:insert_local)
           .with 'localPath' => host, 'outputPath' => container
       end
-      it { expect(container_class).to have_received(:run).with(image, "ls -l #{container}", []) }
+      it { expect(container_class).to have_received(:run).with(image, "ls -l #{container}", default_options) }
     end
 
     context 'with permissions' do
@@ -81,10 +83,10 @@ RSpec.describe Construi::Image do
       it do
         expect(container_class)
           .to have_received(:run)
-          .with(image, "chmod -R #{permissions} #{container}", [])
+          .with(image, "chmod -R #{permissions} #{container}", {})
       end
       it { expect($stdout.string).to include(" > chmod -R #{permissions} #{container}") }
-      it { expect(container_class).to have_received(:run).with(image, "ls -l #{container}", []) }
+      it { expect(container_class).to have_received(:run).with(image, "ls -l #{container}", default_options) }
     end
 
   end
@@ -232,7 +234,7 @@ RSpec.describe Construi::IntermediateImage do
     context "single run" do
       subject! { intermediate_image.run(cmd, env) }
 
-      it { expect(image).to have_received(:run).with(cmd, env) }
+      it { expect(image).to have_received(:run).with(cmd, env: env) }
       it { expect(image).to_not have_received(:delete) }
       it { expect(second_image).to_not have_received(:delete) }
     end
@@ -240,7 +242,7 @@ RSpec.describe Construi::IntermediateImage do
     context "double run" do
       subject! { intermediate_image.run(cmd, env).run(cmd, env) }
 
-      it { expect(second_image).to have_received(:run).with(cmd, env) }
+      it { expect(second_image).to have_received(:run).with(cmd, env: env) }
       it { expect(second_image).to have_received(:delete) }
     end
   end

data/spec/lib/construi/runner_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Construi::Runner do
     subject! { runner.run(targets) }
 
     it { expect(docker).to have_received(:validate_version!) }
-    it { expect(image).to have_received(:run).with('cmd1', []) }
+    it { expect(image).to have_received(:run).with('cmd1', env: [], privileged: false) }
     it { expect(image).to have_received(:delete) }
 
     it { expect($stdout.string).to include('Running target1...'.green) }

data/spec/spec_helper.rb

@@ -1,17 +1,17 @@
 
-require 'codeclimate-test-reporter'
-require 'coveralls'
 require 'stringio'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  Coveralls::SimpleCov::Formatter,
-  SimpleCov::Formatter::HTMLFormatter,
-  CodeClimate::TestReporter::Formatter
-]
+if ENV['COVERAGE']
+  require 'simplecov'
 
-SimpleCov.start do
-  add_filter '/vendor/'
-  add_filter '/spec'
+  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+
+  SimpleCov.start do
+    add_filter '/vendor/'
+    add_filter '/spec'
+
+    coverage_dir 'target/site/coverage'
+  end
 end
 
 require 'construi'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: construi
 version: !ruby/object:Gem::Version
-  version: 0.35.2
+  version: 0.36.0
   prerelease: 
 platform: ruby
 authors:
-- lstephen
+- Levi Stephen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,9 +74,9 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,13 +92,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        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
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,70 @@ dependencies:
     - - ~>
       - !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
 email:
 - levi.stephen@gmail.com
@@ -159,6 +239,8 @@ files:
 - construi.yml
 - construi/deploy/script.sh
 - construi/release/script.sh
+- construi/site/Dockerfile
+- construi/site/run.sh
 - lib/construi.rb
 - lib/construi/config.rb
 - lib/construi/container.rb
@@ -166,13 +248,16 @@ files:
 - lib/construi/runner.rb
 - lib/construi/target.rb
 - lib/construi/version.rb
+- site/_config.yml
+- site/_layouts/default.html
+- site/css/main.css
+- site/index.md
 - spec/lib/construi/config_spec.rb
 - spec/lib/construi/container_spec.rb
 - spec/lib/construi/image_spec.rb
 - spec/lib/construi/runner_spec.rb
 - spec/lib/construi/target_spec.rb
 - spec/lib/construi_spec.rb
-- spec/lib/container_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lstephen/construi
@@ -196,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -511268668322759915
+      hash: 3996143920921331195
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2
@@ -210,6 +295,6 @@ test_files:
 - spec/lib/construi/runner_spec.rb
 - spec/lib/construi/target_spec.rb
 - spec/lib/construi_spec.rb
-- spec/lib/container_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/lib/container_spec.rb

@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-require 'securerandom'
-
-RSpec.describe Construi::Container do
-  let!(:docker_container_class) { class_spy(Docker::Container).as_stubbed_const }
-  let(:docker_container) do
-    instance_double(Docker::Container, :id => SecureRandom.hex(16)).as_null_object
-  end
-
-  let(:image_id) { SecureRandom.hex(16) }
-  let(:image) { instance_double(Docker::Image, :id => image_id).as_null_object }
-
-  let(:container) { Construi::Container.wrap docker_container }
-
-  describe '#delete' do
-    subject! { container.delete }
-
-    it { expect(docker_container).to have_received(:delete) }
-  end
-
-  describe '#attach_stdout' do
-    subject(:attach_stdout) { -> { container.attach_stdout } }
-
-    context 'when attached succesfully' do
-      before do
-        allow(docker_container)
-          .to receive(:attach)
-          .and_yield('stream', 'msg1')
-          .and_yield('stream', 'msg2')
-      end
-
-      subject! { attach_stdout.call }
-
-      it { expect(docker_container).to have_received(:attach).with(:stream => true, :logs => true) }
-      it { expect($stdout.string).to include("msg1\nmsg2") }
-    end
-
-    context 'when attach times out' do
-      before do
-        allow(docker_container)
-          .to receive(:attach)
-          .and_raise(Docker::Error::TimeoutError.new)
-      end
-
-      subject! { attach_stdout.call }
-
-      it { expect($stdout.string).to include('Failed to attach to stdout'.yellow) }
-    end
-  end
-
-  describe '#commit' do
-    before { allow(docker_container).to receive(:commit).and_return image }
-
-    subject! { container.commit }
-
-    it { expect(docker_container).to have_received(:commit) }
-    it { is_expected.to eq(Construi::Image.wrap(image)) }
-  end
-
-  describe '#run' do
-    before { allow(docker_container).to receive(:wait).and_return({'StatusCode' => status_code}) }
-    before { allow(docker_container).to receive(:commit).and_return image }
-
-    subject(:run) { -> { container.run } }
-
-    context 'when command succeeds' do
-      let(:status_code) { 0 }
-
-      subject! { run.call }
-
-      it { expect(docker_container).to have_received(:start) }
-      it { expect(docker_container).to have_received(:attach).with(:stream => true, :logs => true) }
-      it { expect(docker_container).to have_received(:wait) }
-      it { expect(docker_container).to have_received(:commit) }
-      it { is_expected.to eq(Construi::Image.wrap(image)) }
-    end
-
-    context 'when command fails' do
-      let(:status_code) { 1 }
-
-      it { expect { run.call }.to raise_error Construi::Container::Error,  /status code: 1/}
-    end
-  end
-
-  describe '.create' do
-    let(:cmd) { 'cmd1 p1 p2' }
-    let(:env) { ['ENV1=VAL1', 'ENV2=VAL2'] }
-    let(:pwd) { '/project/dir' }
-
-    before { allow(docker_container_class).to receive(:create).and_return docker_container }
-    before { allow(Dir).to receive(:pwd).and_return(pwd) }
-
-    subject! { Construi::Container::create(image, cmd, env) }
-
-    it do
-      expect(docker_container_class).to have_received(:create).with( {
-        'Cmd' => ['cmd1', 'p1', 'p2' ],
-        'Image' => image_id,
-        'Env' => env.to_json,
-        'Tty' => false,
-        'WorkingDir' => '/var/workspace',
-        'HostConfig' => { 'Binds' => ["#{pwd}:/var/workspace"] }
-        } )
-    end
-    it { is_expected.to eq(Construi::Container.wrap docker_container) }
-  end
-
-  describe '.run' do
-    let(:cmd) { 'cmd1 p1 p2' }
-
-    before { allow(docker_container_class).to receive(:create).and_return docker_container }
-    before { allow(docker_container).to receive(:wait).and_return({'StatusCode' => 0}) }
-    before { allow(docker_container).to receive(:commit).and_return image }
-
-    subject! { Construi::Container.run(image, cmd, []) }
-
-    it do
-      expect(docker_container_class).to have_received(:create).with(
-        hash_including( {
-          'Cmd' => ['cmd1', 'p1', 'p2'],
-          'Image' => image_id
-        }))
-    end
-    it { is_expected.to eq(Construi::Image.wrap image) }
-    it { expect(docker_container).to have_received(:start) }
-    it { expect(docker_container).to have_received(:commit) }
-    it { expect(docker_container).to have_received(:delete) }
-  end
-
-end
-