construi 0.40.0 → 0.41.0

data/lib/construi/config.rb

@@ -93,9 +93,19 @@ module Construi
       end
     end
 
+    module Volumes
+      def volumes
+        with_parent([], &:volumes).concat get(:volumes, [])
+      end
+
+      def volumes_from
+        with_parent([], &:volumes_from).concat get(:volumes_from, [])
+      end
+    end
+
     module Options
       def options
-        { env: env, privileged: privileged? }
+        { env: env, privileged: privileged?, volumes: volumes }
       end
     end
 
@@ -105,6 +115,7 @@ module Construi
         include Image
         include Files
         include EnvironmentVariables
+        include Volumes
         include Options
 
         attr_reader :yaml
@@ -130,6 +141,7 @@ module Construi
       include Image
       include Files
       include EnvironmentVariables
+      include Volumes
       include Links
     end
 

data/lib/construi/console.rb

@@ -1,3 +1,4 @@
+require 'construi/options'
 
 module Construi
   module Console
@@ -11,6 +12,10 @@ module Construi
       puts msg.green
     end
 
+    def self.verbose(msg)
+      puts msg if Options.enabled?(:verbose)
+    end
+
     def self.progress(msg)
       puts
       info msg
@@ -22,6 +27,25 @@ module Construi
       end
     end
 
+    def self.logger(name)
+      Logger.new name
+    end
+
+    class Logger
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def debug?
+        true
+      end
+
+      def debug(msg)
+        Console.verbose "#{name}: #{msg}"
+      end
+    end
   end
 end
 

data/lib/construi/container.rb

@@ -69,11 +69,14 @@ module Construi
       env = options[:env] || []
       privileged = options[:privileged] || false
       links = options[:links] || []
+      volumes = options[:volumes] || []
+      volumes_from = options[:volumes_from] || []
 
       host_config = {
-        'Binds' => ["#{Dir.pwd}:/var/workspace"],
+        'Binds' => ["#{Dir.pwd}:/var/workspace"].concat(volumes),
         'Privileged' => privileged,
-        'Links' => links
+        'Links' => links,
+        'VolumesFrom' => volumes_from
       }
 
       create_options = {

data/lib/construi/options.rb

@@ -0,0 +1,17 @@
+module Construi
+  module Options
+    @features = []
+
+    class << self
+      attr_accessor :features
+
+      def enable(feature)
+        features << feature
+      end
+
+      def enabled?(feature)
+        features.include? feature
+      end
+    end
+  end
+end

data/lib/construi/runner.rb

@@ -1,4 +1,5 @@
 
+require 'construi/console'
 require 'construi/container'
 require 'construi/image'
 require 'construi/target'
@@ -7,6 +8,7 @@ require 'construi/version'
 
 require 'colorize'
 require 'docker'
+require 'optparse'
 
 module Construi
   DOCKER_TIMEOUT = 60
@@ -21,7 +23,9 @@ module Construi
       docker_host = ENV['DOCKER_HOST']
       Docker.url = docker_host if docker_host
 
-      puts "Docker url: #{Docker.url}"
+      Console.verbose "Docker url: #{Docker.url}"
+
+      Docker.logger = Console.logger 'Docker'
 
       Excon.defaults[:ssl_verify_peer] = false
 
@@ -34,11 +38,15 @@ module Construi
     end
 
     def run(targets)
-      puts "Construi version: #{Construi::VERSION}"
+      OptionParser.new do |opts|
+        opts.on '-v', '--[no-]verbose' do |v|
+          Options.enable(:verbose) if v
+        end
+      end.parse!
 
-      setup_docker
+      Console.verbose "Construi version: #{Construi::VERSION}"
 
-      puts "Current directory: #{Dir.pwd}"
+      setup_docker
 
       targets.map { |t| Target.new t, @config.target(t) } .each(&:run)
     end

data/lib/construi/target.rb

@@ -22,11 +22,13 @@ module Construi
         final_image = IntermediateImage.seed(create_initial_image).reduce(commands) do |image, command|
           Console.progress " > #{command}"
 
-          link_option = links.each_with_object([]) do |l, o|
-            o << "#{l.id}:#{l.name}"
-          end
+          options = config.options.merge(
+            links: link_option(links),
+            volumes_from: volumes_from_option(config, links),
+            name: name
+          )
 
-          image.run command, @config.options.merge(links: link_option, name: name)
+          image.run command, options
         end
 
         final_image.delete
@@ -43,7 +45,26 @@ module Construi
 
     def start_linked_images
       @config.links.map do |(name, config)|
-        Image.from(config).start(config.options.merge name: name, log_lifecycle: true)
+        options = config.options.merge(
+          name: name,
+          log_lifecycle: true
+        )
+
+        Image.from(config).start options
+      end
+    end
+
+    def link_option(links)
+      links.each_with_object([]) do |l, o|
+        o << "#{l.id}:#{l.name}"
+      end
+    end
+
+    def volumes_from_option(config, links)
+      config.volumes_from.each_with_object([]) do |v, o|
+        volume_from = links.detect { |l| l.name == v }
+
+        o << (volume_from.nil? ? v : volume_from.id)
       end
     end
   end

data/lib/construi/version.rb

@@ -1,3 +1,3 @@
 module Construi
-  VERSION = "0.40.0"
+  VERSION = "0.41.0"
 end

data/spec/lib/construi/container_spec.rb

@@ -92,7 +92,8 @@ RSpec.describe Construi::Container do
         'HostConfig' => {
           'Binds' => ["#{pwd}:/var/workspace"],
           'Privileged' => true,
-          'Links' => []
+          'Links' => [],
+          'VolumesFrom' => []
         }
       } )
     end

data/spec/lib/construi/runner_spec.rb

@@ -9,6 +9,9 @@ RSpec.describe Construi::Runner do
 
   before { allow(image_class).to receive(:from).and_return image }
 
+  let(:option_parser) { instance_double(OptionParser).as_null_object }
+  before { allow(OptionParser).to receive(:new).and_return option_parser }
+
   subject(:runner) { Construi::Runner.new(config) }
 
   describe '#run' do
@@ -32,7 +35,16 @@ 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', env: [], privileged: false, links: [], name: 'target1') }
+    it do
+      expect(image).to have_received(:run)
+        .with('cmd1',
+          env: [],
+          privileged: false,
+          volumes: [],
+          volumes_from: [],
+          links: [],
+          name: 'target1')
+    end
     it { expect(image).to have_received(:delete) }
 
     it { expect($stdout.string).to include('Running target1...'.green) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: construi
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -246,6 +246,7 @@ files:
 - lib/construi/console.rb
 - lib/construi/container.rb
 - lib/construi/image.rb
+- lib/construi/options.rb
 - lib/construi/runner.rb
 - lib/construi/target.rb
 - lib/construi/version.rb
@@ -282,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2884457678396287104
+      hash: 4041224697425592295
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2