docker-builder 0.1.50 → 0.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788eee0ed4df18ea4e4a1fd77f10911e9cde33d1
-  data.tar.gz: 624e35b8b6b25a1076a30dd14f3a63e5d8c3a63c
+  metadata.gz: 900f989de3f0c47d40b6494a9e419acd6ca42324
+  data.tar.gz: 491ee67ea44c3564aed1c1492b9f79198a69f9ef
 SHA512:
-  metadata.gz: 2bbc60def511de0598840ab560068fc0ed2211f9e81eac2f6ce6004d2ad1c72b83187fae613a4b231b57096fcb46528896093c1ba45e87c0e9baae6278c7ee63
-  data.tar.gz: ffe1afc13b3d998384dba5ff084d9370411d98daa5f6abeeef91fe4f87bab323a259c90b65d6e9f88ae11cacc32a08b59c89695b21ed0b582a8da3d7b633efe9
+  metadata.gz: 9613b5f3f6800d10c304ce9684dba601eab390abf7eec04f33db24893b390910bd2a59b5335dba6940b0e58029dd9cbe0c750923b2fff58e36636daba161d19c
+  data.tar.gz: 02022477d3b197ab3a17100fecffdda1542db020637af80b7b0d728bbbb86c1e21b0c9a6472f2a9b265876279a93128e28c7ba1a0c98f88e60b29ddb363985e6

data/{Rakefile → Rakefile_temp}

@@ -7,7 +7,8 @@ SERVERS =  %w(redis mysql elasticsearch phpmyadmin phpredisadmin apps-ruby nginx
 
 #
 require_relative 'lib/docker_builder/server_settings'
-require_relative 'lib/docker_builder/manager'
+require_relative 'lib/docker_builder/manager_image'
+require_relative 'lib/docker_builder/manager_container'
 
 
 
@@ -15,14 +16,14 @@ require_relative 'lib/docker_builder/manager'
 desc "Build image"
 task :build, [:name] do |task, args|
   #name = args[:name]
-  Manager.build_image(name)
+  ManagerImage.build_image(name)
   #sh "sh build_#{name}.sh"
 end
 
 desc "Destroy image"
 task :destroy_image, [:name] do |task, args|
   name = args[:name]
-  Manager.destroy_image(name)
+  ManagerImage.destroy_image(name)
 end
 
 
@@ -39,14 +40,14 @@ end
 desc "Run container"
 task :run, [:name] do |task, args|
   name = args[:name]
-  Manager.run_container(name)
+  ManagerContainer.run_container(name)
 end
 
 
 desc "Start container"
 task :start, [:name] do |task, args|
   name = args[:name]
-  Manager.start_container(name)
+  ManagerContainer.start_container(name)
 end
 
 desc "Restart container"
@@ -59,7 +60,7 @@ end
 
 desc "Destroy container"
 task :destroy, [:name] do |task, args|
-  Manager.destroy_container(args[:name])
+  ManagerContainer.destroy_container(args[:name])
 end
 
 =begin
@@ -135,6 +136,6 @@ end
 
 desc 'Exec task, run_test[name,recipe_name]'
 task :exec, [:name, :recipe_name] do |task, args|
-  Manager.exec_task(args[:name], args[:recipe_name])
+  ManagerContainer.exec_task(args[:name], args[:recipe_name])
 
 end

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.50.gem
+gem install ./docker-builder-0.1.54.gem

data/lib/docker_builder.rb

@@ -14,7 +14,10 @@ module DockerBuilder
     command
     cli
     server_settings
-    manager
+    manager_image
+    manager_container
     manager_swarm
+    provisioner/base
+    provisioner/chef
   }.each {|lib| require File.join(LIBRARY_PATH, lib) }
 end

data/lib/docker_builder/cli.rb

@@ -46,46 +46,20 @@ class CLI < Thor
     warnings = false
     errors = false
 
-
-    servers = nil
     begin
       Config.load(options)
 
-      #puts "config servers: #{Config.inspect}"
-      #puts "config: #{Config.options.inspect}"
-      #exit
-
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
+      Config.servers.each do |name, server_settings|
+        #server_settings = Settings.load_settings_for_server(name)
 
         #puts "s: #{server_settings.inspect}"
-        #exit
 
-        Manager.destroy_image(name, server_settings)
-        Manager.build_image(name, server_settings)
+        ManagerImage.destroy_image(name, server_settings)
+        ManagerImage.build_image(name, server_settings)
       end
 
 
-      #servers = options[:server].split(',').map(&:strip)
-      #models = triggers.map {|trigger|
-      #  Model.find_by_trigger(trigger)
-      #}.flatten.uniq
-
-      #raise Error, "No servers found " + "'#{ triggers.join(',') }'." if models.empty?
-
-      # Finalize Logger and begin real-time logging.
-      #Logger.start!
-
     rescue Exception => err
-      #Logger.error Error.wrap(err)
-      #unless Helpers.is_backup_error? err
-      #  Logger.error err.backtrace.join("\n")
-      #end
-
-      # Logger configuration will be ignored
-      # and messages will be output to the console only.
-      #Logger.abort!
-
       puts "exception: #{err.inspect}"
       raise err
       exit(3)
@@ -130,15 +104,13 @@ class CLI < Thor
     warnings = false
     errors = false
 
-    servers = nil
-
     begin
       Config.load(options)
 
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
+      Config.servers.each do |name, server_settings|
+        #server_settings = Settings.load_settings_for_server(name)
 
-        Manager.destroy_image(name, server_settings)
+        ManagerImage.destroy_image(name, server_settings)
       end
 
     rescue Exception => err
@@ -189,19 +161,18 @@ class CLI < Thor
     errors = false
 
 
-    servers = nil
     begin
       Config.load(options)
 
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
+      Config.servers.each do |name, server_settings|
+        #server_settings = Settings.load_settings_for_server(name)
 
         if server_settings.is_swarm_mode?
           ManagerSwarm.destroy_service(name, server_settings)
           ManagerSwarm.create_service(name, server_settings)
         else
-          Manager.destroy_container(name, server_settings)
-          Manager.run_container(name, server_settings)
+          ManagerContainer.destroy_container(name, server_settings)
+          ManagerContainer.run_container(name, server_settings)
         end
 
       end
@@ -255,10 +226,10 @@ class CLI < Thor
     begin
       Config.load(options)
 
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
+      Config.servers.each do |name, server_settings|
+        #server_settings = Settings.load_settings_for_server(name)
 
-        Manager.start_container(name, server_settings)
+        ManagerContainer.start_container(name, server_settings)
       end
 
     rescue Exception => err
@@ -309,18 +280,16 @@ class CLI < Thor
     warnings = false
     errors = false
 
-
-    servers = nil
     begin
       Config.load(options)
 
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
+      Config.servers.each do |name, server_settings|
+        #server_settings = Settings.load_settings_for_server(name)
 
         if server_settings.is_swarm_mode?
           ManagerSwarm.destroy_service(name, server_settings)
         else
-          Manager.destroy_container(name, server_settings)
+          ManagerContainer.destroy_container(name, server_settings)
         end
 
       end
@@ -375,14 +344,13 @@ class CLI < Thor
     errors = false
 
 
-    servers = nil
     begin
       Config.load(options)
 
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
+      Config.servers.each do |name, server_settings|
+        #server_settings = Settings.load_settings_for_server(name)
 
-        Manager.stop_container(name, server_settings)
+        ManagerContainer.stop_container(name, server_settings)
       end
 
     rescue Exception => err
@@ -435,14 +403,13 @@ class CLI < Thor
     warnings = false
     errors = false
 
-    servers = nil
     begin
       Config.load(options)
 
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
+      Config.servers.each do |name, server_settings|
+        #server_settings = Settings.load_settings_for_server(name)
 
-        Manager.clear_cache(name, server_settings)
+        ManagerContainer.clear_cache(name, server_settings)
       end
 
     rescue Exception => err

data/lib/docker_builder/config.rb

@@ -16,7 +16,8 @@ module DockerBuilder
     class << self
       #include Utilities::Helpers
 
-      attr_reader :servers, :root_path, :config_file, :tmp_path, :options
+      attr_reader :servers, :options,
+                  :root_path, :config_file, :tmp_path
 
 
       # Define on self, since it's  a class method
@@ -36,9 +37,10 @@ module DockerBuilder
 
       # Loads the user's +config.rb+ and all model files.
       def load(opts = {})
-        puts "update opts from #{opts}"
         update(opts)  # from the command line
 
+        #config_file = 'temp_config.rb'
+
         puts "config file: #{config_file}"
 
         unless File.exist?(config_file)
@@ -46,27 +48,40 @@ module DockerBuilder
           raise "Could not find configuration file: '#{config_file}'."
         end
 
-        config = File.read(config_file)
-
-        #version = DockerBuilder::VERSION.split('.').first
-        #unless config =~ /^# Backup v#{ version }\.x Configuration$/
-        #  raise Error, <<-EOS
-        #    Invalid Configuration File
-        #  EOS
-        #end
+        text_config = File.read(config_file)
 
         dsl = DSL.new
-        dsl.instance_eval(config, config_file)
+        dsl.instance_eval(text_config, config_file)
 
+        # set options from dsl object
         update(dsl._config_options)  # from config.rb
-        update(opts)              # command line takes precedence
+        # command line takes precedence
+        update(opts)
 
         #Dir[File.join(File.dirname(config_file), 'models', '*.rb')].each do |model|
         #  dsl.instance_eval(File.read(model), model)
         #end
 
         # servers
-        load_servers(opts)
+        # Identify all servers
+        if @options['server']
+          srv_name = @options['server'] || @options[:server]
+          # one server
+          @servers = {srv_name => dsl._config_servers[srv_name]}
+        else
+          # all servers
+          @servers = dsl._config_servers
+        end
+
+
+        @servers.each do |name, sc|
+          # from common config
+          sc.common_config = self
+          sc.properties['name'] ||= name
+          #sc.properties['common'] = Config.options[:common]
+        end
+
+
 
       end
 
@@ -88,21 +103,57 @@ module DockerBuilder
         @options
       end
 
-      def servers
-        options[:servers]
-      end
+      #def servers
+        #options[:servers]
+        #@_servers || []
+      #end
 
-      def load_servers(opts)
-        # Identify all servers
-        if opts[:server]
-          server_name = opts[:server]
-          options[:servers] = {server_name=>options[:servers][server_name] }
-        else
-          # get from config
-          #options[:servers] = options[:servers]
+
+      ### NOT USED
+      ## TODO: refactor
+      def self.load_settings_for_server(name, opts={})
+        settings = ServerSettings.new
+
+        settings.set 'name', name
+
+        # set from main Config
+        Config.servers[name].each do |k,v|
+          settings.properties[k]=v
         end
 
 
+        #puts "current=#{File.dirname(__FILE__)}"
+        #puts "ff=#{file_base_settings}"
+
+        #
+        #t = File.read(file_base_settings) rescue ''
+        #eval(t, settings.get_binding)
+
+
+        #
+        f = file_settings_for_server(name)
+        t = File.read(f) rescue ''
+        eval(t, settings.get_binding)
+
+        #
+        settings.properties['name'] ||= name
+
+        # from common config
+        settings.properties['common'] = Config.options[:common]
+
+        settings
+      end
+
+
+      ### helpers
+
+      def self.file_settings_for_server(name)
+        #File.join(File.dirname(__FILE__), '..', 'config', "#{name}.rb")
+        File.join(Config.root_path, 'servers', name, 'config.rb')
+      end
+
+      def self.file_server_base_settings
+        File.join(File.dirname(__FILE__), '..', 'config' ,'common.rb')
       end
 
 
@@ -119,23 +170,17 @@ module DockerBuilder
         #puts "root from opts = #{root_path}"
 
         if root_path.empty?
-          #puts " set default"
           root_path = File.path(Dir.getwd)
-          #puts "default root = #{root_path}"
         end
 
         new_root = root_path.empty? ? false : set_root_path(root_path)
 
-        #puts "FINAL root= #{@root_path}"
-        #exit
-
         DEFAULTS.each do |name, ending|
           set_path_variable(name, options[name], ending, new_root)
         end
 
         # options
         opts.each do |name, v|
-          #puts "set var #{name} == #{v}"
           set_variable(name, v)
         end
 
@@ -147,8 +192,6 @@ module DockerBuilder
       # Sets the @root_path to the given +path+ and returns it.
       # Raises an error if the given +path+ does not exist.
       def set_root_path(path)
-        #puts "set path = #{path}"
-
         # allows #reset! to set the default @root_path,
         # then use #update to set all other paths,
         # without requiring that @root_path exist.
@@ -156,8 +199,6 @@ module DockerBuilder
 
         path = File.expand_path(path)
 
-        #puts " res root path=#{path}"
-
         unless File.directory?(path)
           raise Error, <<-EOS
             Root Path Not Found

data/lib/docker_builder/config/dsl.rb

@@ -8,9 +8,11 @@ module DockerBuilder
       #Server = DockerBuilder::Server
 
       attr_reader :_config_options
+      attr_reader :_config_servers
 
       def initialize
         @_config_options = {}
+        @_config_servers = {}
       end
 
       # Allow users to set command line path options in config.rb
@@ -18,12 +20,26 @@ module DockerBuilder
         define_method name, lambda {|path| _config_options[name] = path }
       end
 
+      # options - common
+      [
+          :prefix, :image_prefix, :container_prefix, :service_prefix,
+          :dir_data
+      ].each do |name|
+        define_method name, lambda {|path| _config_options[name] = path }
+      end
+
       # allowed options
-      [:servers, :common, :base].each do |name|
+      [:common, :base].each do |name|
         define_method name, lambda {|v| _config_options[name] = v }
       end
 
 
+      def server(server_name, &block)
+        sc = ServerSettings.new
+        block.call(sc)
+        #sc.instance_eval(&block)
+        _config_servers[server_name] = sc
+      end
 
       # Allows users to create preconfigured models.
 =begin