percheron 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 428285d6a914c5a406b8abb45fbd20c3fadcb343
-  data.tar.gz: 2a60f876154c79d2fc83e1b6d5582a688e7fd5dd
+  metadata.gz: c3d3fe11591f768bc7d5867837dc546b679bbf85
+  data.tar.gz: ab113fd870d359c2ba383340feab044e42861b26
 SHA512:
-  metadata.gz: dc1fb6039256e90aaa1ed5cc28341bab6f73522d7c5fb4734515ff60f25d7f356d5e302491bdfe5bb46fe12e8809b673c85d2a0f9b5cc566b77f01ec39ab39d5
-  data.tar.gz: 8b0afb6b8a576b5ff668fe25b0071c6b675e6c7838b66786354047a9975b8f41edbebe43623556d9b3ee9258e22d6577c6b30ee8641b6f3e3aa496b797d1eaad
+  metadata.gz: d0b7b65daffc775d0606a6d11a5b55a26387c0d4362f4a75fcded15f4c9246ec35a732b992dc14f944a12d1521ce017665b5f762c81aba8b1cd99eab72c8f377
+  data.tar.gz: 3426521b489b6b91d5bbfad9b9fae2bae6c9e89bfaa3d3dfa2b75552571bbcbf5943c5d02d4cd992d0975be21c10ac071e6282c326c4bfe482c85d80e038b069

data/lib/percheron/actions/build.rb

@@ -12,7 +12,10 @@ module Percheron
 
       def execute!
         results = []
-        results << build! if unit.buildable?
+        if unit.buildable?
+          results << write_out_temp_dockerfile!
+          results << build!
+        end
         results.compact.empty? ? nil : unit
       end
 
@@ -23,13 +26,41 @@ module Percheron
 
         def options
           {
-            'dockerfile'  => unit.dockerfile.basename.to_s,
+            'dockerfile'  => dockerfile,
             't'           => unit.image_name,
             'forcerm'     => true,
             'nocache'     => nocache
           }
         end
 
+        def dockerfile
+          temp_dockerfile.basename.to_s
+        end
+
+        def temp_dockerfile
+          @temp_dockerfile ||= Pathname.new(temp_dockerfile_name)
+        end
+
+        def temp_dockerfile_name
+          @temp_dockerfile_name ||= begin
+            '%s/%s.%s' % [
+              unit.dockerfile.expand_path.dirname.to_s,
+              unit.dockerfile.basename.to_s,
+              SecureRandom.urlsafe_base64
+            ]
+          end
+        end
+
+        def write_out_temp_dockerfile!
+          options = { 'secrets' => Config.secrets }
+          content = Liquid::Template.parse(unit.dockerfile.read).render(options)
+          File.open(temp_dockerfile, 'w') { |f| f.write(content) }
+        end
+
+        def remove_temp_dockerfile!
+          temp_dockerfile.delete
+        end
+
         def build!
           in_working_directory(base_dir) do
             execute_pre_build_scripts!
@@ -38,6 +69,8 @@ module Percheron
               $logger.debug '%s' % [ out.strip ]
             end
           end
+        ensure
+          remove_temp_dockerfile!
         end
 
         def execute_pre_build_scripts!

data/lib/percheron/actions/exec.rb

@@ -37,7 +37,6 @@ module Percheron
           Stop.new(unit).execute!  unless unit_running
         end
 
-        # FIXME
         def commit_and_tag_new_image!
           new_image = unit.container.commit
           new_image.tag(repo: unit.image_repo, tag: unit.version.to_s, force: true)

data/lib/percheron/commands/abstract.rb

@@ -2,8 +2,8 @@ module Percheron
   module Commands
     class Abstract < Clamp::Command
 
-      option([ '-c', '--config_file' ], 'CONFIG', 'Config file',
-             default: Config::DEFAULT_CONFIG_FILE)
+      option([ '-c', '--config_file' ], 'CONFIG', 'Config file', default:
+              ENV.fetch('PERCHERON_CONFIG', Config::DEFAULT_CONFIG_FILE))
 
       option('--version', :flag, 'show version') do
         puts Percheron::VERSION
@@ -22,10 +22,6 @@ module Percheron
         option('--start', :flag, 'Start unit', default: false)
       end
 
-      def default_config_file
-        ENV.fetch('PERCHERON_CONFIG', Config::DEFAULT_CONFIG_FILE)
-      end
-
       def execute
         stack.valid?
       rescue => e
@@ -40,7 +36,7 @@ module Percheron
 
       def config
         @config ||= begin
-          Percheron::Config.new(config_file).tap do |c|
+          Percheron::Config.load!(config_file).tap do |c|
             Percheron::Connection.load!(c)
           end
         end

data/lib/percheron/commands/console.rb

@@ -7,7 +7,7 @@ module Percheron
       def execute
         super
         require 'pry-byebug'
-        pry
+        pry Percheron
       end
 
       private

data/lib/percheron/config.rb

@@ -3,32 +3,72 @@ require 'yaml'
 module Percheron
   class Config
 
-    extend Forwardable
+    include Singleton
 
     DEFAULT_CONFIG_FILE = '.percheron.yml'
 
-    def_delegators :contents, :docker
+    # rubocop:disable Style/ClassVars
+    @@file = Pathname.new(DEFAULT_CONFIG_FILE).expand_path
+    # rubocop:enable Style/ClassVars
 
-    def initialize(file = DEFAULT_CONFIG_FILE)
-      @file = Pathname.new(file).expand_path
+    def self.load!(file)
+      instance.load!(file)
+    end
+
+    # rubocop:disable Style/ClassVars
+    def load!(file)
+      @@file = Pathname.new(file).expand_path
+      invalidate_memoised_values!
       self
     end
+    # rubocop:enable Style/ClassVars
+
+    def self.stacks
+      instance.stacks
+    end
 
     def stacks
       @stacks ||= process_stacks!
     end
 
+    def self.file_base_path
+      instance.file_base_path
+    end
+
     def file_base_path
       file.dirname
     end
 
-    def valid?
-      Validators::Config.new(file).valid?
+    def self.secrets
+      instance.secrets
+    end
+
+    def secrets
+      secrets_file ? Hashie::Mash.new(YAML.load_file(secrets_file)) : {}
+    end
+
+    def self.docker
+      instance.docker
+    end
+
+    def docker
+      contents.docker
     end
 
     private
 
-      attr_reader :file
+      def file
+        @@file
+      end
+
+      def secrets_file
+        return unless yaml_contents.secrets_file
+        File.expand_path(yaml_contents.secrets_file, file_base_path)
+      end
+
+      def invalidate_memoised_values!
+        @stacks = @yaml_contents = @raw_contents = @contents = nil
+      end
 
       def process_stacks!   # FIXME: bugs here :(
         stacks_by_name = contents.stacks.to_hash_by_key(:name)
@@ -91,29 +131,42 @@ module Percheron
       end
 
       def raw_contents
-        @contents ||= Hashie::Mash.new(YAML.load_file(file))
+        @raw_contents ||= file.read
+      end
+
+      def yaml_contents
+        @yaml_contents ||= Hashie::Mash.new(YAML.load(raw_contents))
+      end
+
+      def templated_contents
+        Liquid::Template.parse(raw_contents).render('secrets' => secrets)
+      end
+
+      def parsed_contents
+        Hashie::Mash.new(YAML.load(templated_contents))
       end
 
       def contents
-        raw_contents.tap do |c|
-          c.docker ||= {}
-          c.docker.host ||= env_docker_host
-          c.docker.cert_path ||= env_cert_path
-          c.docker.ssl_verify_peer ||= env_ssl_verify_peer
+        @contents ||= begin
+          parsed_contents.tap do |c|
+            c.docker ||= {}
+            c.docker.host ||= env_docker_host
+            c.docker.cert_path ||= env_cert_path
+            c.docker.ssl_verify_peer ||= env_ssl_verify_peer
+          end
         end
       end
 
       def env_docker_host
-        @env_docker_host ||= ENV['DOCKER_HOST'] ||
-                             fail("Docker host not defined in '#{file}' or ENV['DOCKER_HOST']")
+        ENV['DOCKER_HOST'] || fail("Docker host not defined in '#{file}' or ENV['DOCKER_HOST']")
       end
 
       def env_cert_path
-        @cert_path ||= ENV['DOCKER_CERT_PATH'] ? File.expand_path(ENV['DOCKER_CERT_PATH']) : nil
+        ENV['DOCKER_CERT_PATH'] ? File.expand_path(ENV['DOCKER_CERT_PATH']) : nil
       end
 
       def env_ssl_verify_peer
-        @ssl_verify_peer ||= (ENV['DOCKER_TLS_VERIFY'] == 1) || true
+        (ENV['DOCKER_TLS_VERIFY'] == 1) || true
       end
   end
 end

data/lib/percheron/connection.rb

@@ -1,4 +1,3 @@
-require 'singleton'
 require 'docker'
 
 module Percheron
@@ -14,12 +13,12 @@ module Percheron
     end
     # rubocop:enable Style/ClassVars
 
-    def self.perform(klass, method, *args)
-      instance.perform(klass, method, *args)
+    def self.perform(klass, method, *args, &blk)
+      instance.perform(klass, method, *args, &blk)
     end
 
     def perform(klass, method, *args)
-      klass.public_send(method, *args)
+      klass.public_send(method, *args) { |out| yield(out) if block_given? }
     rescue => e
       $logger.debug '%s.%s(%s) - %s' % [ klass, method, args, e.inspect ]
       raise

data/lib/percheron/validators/config.rb

@@ -23,8 +23,7 @@ module Percheron
           [
             :validate_config_file_defined,
             :validate_config_file_existence,
-            :validate_config_file_not_empty,
-            :validate_config_file_contents
+            :validate_config_file_not_empty
           ]
         end
 
@@ -44,10 +43,6 @@ module Percheron
           'Is empty' if config_file_contents.empty?
         end
 
-        def validate_config_file_contents
-          'Is invalid' unless config_file_contents.docker
-        end
-
     end
   end
 end

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = '0.7.11'
+  VERSION = '0.7.12'
 end

data/lib/percheron.rb

@@ -6,6 +6,7 @@ require 'naught'
 require 'semantic'
 require 'metastore'
 require 'liquid'
+require 'singleton'
 
 require 'percheron/oh_dear'
 require 'percheron/core_extensions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp