construi 0.29.0 → 0.30.0

data/README.md

@@ -1,4 +1,5 @@
 # Construi
 
-[![Gem](https://img.shields.io/gem/v/construi.svg?style=plastic)](https://rubygems.org/gems/construi) [![Code Climate](https://img.shields.io/codeclimate/github/lstephen/construi.svg?style=plastic)](https://codeclimate.com/github/lstephen/construi) [![Code Climate](https://img.shields.io/codeclimate/coverage/github/lstephen/construi.svg?style=plastic)](https://codeclimate.com/github/lstephen/construi) [![Coveralls](https://img.shields.io/coveralls/lstephen/construi/develop.svg?style=plastic)](https://coveralls.io/r/lstephen/construi)
+[![Gem](https://img.shields.io/gem/v/construi.svg?style=plastic)](https://rubygems.org/gems/construi) [![Build Status](http://jenkins.mylonelybear.org/buildStatus/icon?job=construi-develop)](http://jenkins.mylonelybear.org/job/construi-develop/)
+[![Code Climate](https://img.shields.io/codeclimate/github/lstephen/construi.svg?style=plastic)](https://codeclimate.com/github/lstephen/construi) [![Code Climate](https://img.shields.io/codeclimate/coverage/github/lstephen/construi.svg?style=plastic)](https://codeclimate.com/github/lstephen/construi) [![Coveralls](https://img.shields.io/coveralls/lstephen/construi/develop.svg?style=plastic)](https://coveralls.io/r/lstephen/construi)
 

data/construi.yml

@@ -1,8 +1,10 @@
 image: ruby:1.9
 
 environment:
+  - JENKINS_URL
+  - BUILD_NUMBER
   - CODECLIMATE_REPO_TOKEN
-  - COVERALLS_TOKEN
+  - COVERALLS_REPO_TOKEN
   - GIT_COMMIT
   - GIT_SSH_KEY
   - RUBYGEMS_API_KEY
@@ -17,35 +19,8 @@ targets:
     - bundle exec rake install
 
   release:
-    - git config user.name lstephen
-    - git config user.email levi.stephen@gmail.com
-    - mkdir -p ~/.ssh
-    - cp ${GIT_SSH_KEY} ~/.ssh/id_rsa
-    - chmod 0600 ~/.ssh/id_rsa
-    - printf "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-    - git config push.default simple
-    - git checkout master
-    - git pull --rebase
-    - echo ${GIT_COMMIT}
-    - git merge --commit ${GIT_COMMIT}
-    - git push origin
-    - git checkout develop
-    - git pull --rebase
-    - bundle install --path vendor/bundle
-    - bundle exec gem bump --version minor
-    - git push origin
+    - bash construi/release/script.sh
 
   deploy:
-    - git config user.name lstephen
-    - git config user.email levi.stephen@gmail.com
-    - mkdir -p ~/.ssh
-    - cp ${GIT_SSH_KEY} ~/.ssh/id_rsa
-    - chmod 0600 ~/.ssh/id_rsa
-    - printf "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-    - git config push.default simple
-    - mkdir -p ~/.gem
-    - "printf -- \"---\\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\" >> ~/.gem/credentials"
-    - chmod 0600 ~/.gem/credentials
-    - bundle install --path vendor/bundle
-    - bundle exec gem release --tag
+    - bash construi/deploy/script.sh
 

data/construi/deploy/script.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+git config user.name lstephen
+git config user.email levi.stephen@gmail.com
+mkdir -p ~/.ssh
+cp ${GIT_SSH_KEY} ~/.ssh/id_rsa
+chmod 0600 ~/.ssh/id_rsa
+printf "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+git config push.default simple
+mkdir -p ~/.gem
+printf -- "---\\n:rubygems_api_key: ${RUBYGEMS_API_KEY}" >> ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+bundle install --path vendor/bundle
+bundle exec gem release --tag
+

data/construi/release/script.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+git config user.name lstephen
+git config user.email levi.stephen@gmail.com
+mkdir -p ~/.ssh
+cp ${GIT_SSH_KEY} ~/.ssh/id_rsa
+chmod 0600 ~/.ssh/id_rsa
+printf "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+git config push.default simple
+git checkout master
+git pull --rebase
+echo ${GIT_COMMIT}
+git merge --commit ${GIT_COMMIT}
+git push origin
+git checkout develop
+git pull --rebase
+bundle install --path vendor/bundle
+bundle exec gem bump --version minor
+git push origin
+

data/lib/construi.rb

@@ -40,7 +40,7 @@ module Construi
   end
 
   def self.run(targets)
-    Runner.new(Config.load('construi.yml')).run(targets)
+    Runner.new(Config.load_file('construi.yml')).run(targets)
   end
 
 end

data/lib/construi/config.rb

@@ -10,8 +10,12 @@ module Construi
       @yaml = yaml
     end
 
-    def self.load(path)
-      new(YAML.load_file(path))
+    def self.load(content)
+      new YAML.load(content)
+    end
+
+    def self.load_file(path)
+      new YAML.load_file(path)
     end
 
     def image

data/lib/construi/container.rb

@@ -35,7 +35,7 @@ module Construi
 
     def self.create(image, cmd, env)
       wrap Docker::Container.create(
-        'Cmd' => ["sh", "-c", cmd],
+        'Cmd' => cmd.split,
         'Image' => image.id,
         'Env' => env.to_json,
         'Tty' => false,

data/lib/construi/version.rb

@@ -1,3 +1,3 @@
 module Construi
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 end

data/spec/lib/config_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+require 'construi/config'
+
+RSpec.describe Construi::Config do
+
+  describe '#image' do
+    let(:config_content) do
+      <<-YAML
+      image: #{image}
+      YAML
+    end
+
+    let(:config) { Construi::Config.load(config_content) }
+
+    subject { config.image }
+
+    %w{ test-image:latest lstephen/construi:latest }.each do |image_name|
+      context "when image is #{image_name}" do
+        let(:image) { image_name }
+        it { is_expected.to eq(image) }
+      end
+    end
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -2,9 +2,18 @@
 require 'codeclimate-test-reporter'
 require 'coveralls'
 
-Coveralls.wear!
+#CodeClimate::TestReporter.start
+#Coveralls.wear!
 
-CodeClimate::TestReporter.start
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  Coveralls::SimpleCov::Formatter,
+  SimpleCov::Formatter::HTMLFormatter,
+  CodeClimate::TestReporter::Formatter
+]
+SimpleCov.start do
+  add_filter '/vendor/'
+  add_filter '/spec'
+end
 
 RSpec.configure do |config|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: construi
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -141,11 +141,14 @@ files:
 - bin/construi
 - construi.gemspec
 - construi.yml
+- construi/deploy/script.sh
+- construi/release/script.sh
 - lib/construi.rb
 - lib/construi/config.rb
 - lib/construi/container.rb
 - lib/construi/image.rb
 - lib/construi/version.rb
+- spec/lib/config_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -163,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 461137891521925881
+      hash: -746607983965103946
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 461137891521925881
+      hash: -746607983965103946
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2
@@ -180,5 +183,6 @@ signing_key:
 specification_version: 3
 summary: Build tool using Docker to specify build environment
 test_files:
+- spec/lib/config_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb