elecksee 1.1.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c76cb776b49ae4be0b00557d87abbe6d82a9da7
-  data.tar.gz: bc2bc7f0e9442eafde3541317b757411b81621ca
+  metadata.gz: 1fa238c10437677255df26d118e761553342b5a6
+  data.tar.gz: f22d8b320fde7d3a531728bf77b3613883d2e6d1
 SHA512:
-  metadata.gz: 7a39c2bde1d990e87956fc80ca5681a018a0e81e139435cda4aa66dce4095c2dc2be68873a410fef276733dfe76efc2f4a5146c1b9523357549538df9bec9c15
-  data.tar.gz: 272f78213b4d9c2b1ec5d447f57b16e1e6e79c66a302428e2ea037e4f847f578096347a54fb9a777bace9d7c72039f45c2b967b14f99e9e93333909e831fb098
+  metadata.gz: de48a9a73b02e227bffbc8f8094355157acdd54bdb1214f3e2b281009827de15ac4261cb084749a840f5b30a1090796eb036eace96badb3ef91d1237eee6d2d0
+  data.tar.gz: 2cd3efa4127547d4ecb1f5f09abf93dfad46313bd38a0baac1686fe29506908c9405d22398fdd4e72423862e34c0f7c262cca99ec2865e6186d487747f14d620

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v2.0.0
+* [fix] Use sudo helper when cloning
+* [enhancement] Disable retry on ephemeral command
+* [enhancement] Dynamic parsing/generation of configuration files
+* [fix] Do not register traps when executing inline
+* [fix] Synchronize childprocess access to prevent race
+
+_WARNING: Updated configuration file handling may cause breakage_
+
 ## v1.1.8
 * Add `include` support for file config
 

data/elecksee.gemspec

@@ -10,6 +10,8 @@ Gem::Specification.new do |s|
   s.description = 'LXC helpers'
   s.require_path = 'lib'
   s.executables = %w(lxc-awesome-ephemeral)
+  s.add_dependency 'bogo'
+  s.add_dependency 'attribute_struct'
   s.add_dependency 'childprocess'
   s.add_dependency 'rye'
   s.files = Dir['{bin,lib}/**/**/*'] + %w(elecksee.gemspec README.md CHANGELOG.md LICENSE CONTRIBUTING.md)

data/lib/elecksee.rb

@@ -1,4 +1,5 @@
 require 'elecksee/version'
+require 'bogo'
 
 # LXC interface
 class Lxc

data/lib/elecksee/ephemeral.rb

@@ -93,7 +93,7 @@ class Lxc
         lxc.start
         if(ephemeral_command)
           lxc.wait_for_state(:running)
-          lxc.container_command(ephemeral_command)
+          lxc.container_command(ephemeral_command, 0) # no retries on ephemeral commands
         else
           cli_output
           lxc.wait_for_state(:stopped)
@@ -137,7 +137,6 @@ class Lxc
           start_action
         end
       else
-        register_traps
         start_action
       end
       true
@@ -194,7 +193,9 @@ class Lxc
       content << 'trap scrub SIGTERM SIGINT SIGQUIT'
       content << "lxc-start -n #{lxc.name} -d"
       content << 'sleep 1'
-      content << "lxc-wait -n #{lxc.name} -s STOPPED"
+      content << 'until [ `lxc-wait -n #{lxc.name} -s STOPPED -t 2` ]'
+      content << 'do'
+      content << 'done'
       content << 'scrub'
       tmp = Tempfile.new('elecksee')
       tmp.chmod(0700)

data/lib/elecksee/helpers.rb

@@ -4,6 +4,10 @@ class Lxc
   # Helper modules
   module Helpers
 
+    class << self
+      attr_accessor :child_process_lock
+    end
+
     autoload :Copies, 'elecksee/helpers/copies'
     autoload :Options, 'elecksee/helpers/options'
 
@@ -56,11 +60,14 @@ class Lxc
         s_err = Tempfile.new('stderr')
         s_out.sync
         s_err.sync
-        c_proc = ChildProcess.build(*Shellwords.split(cmd))
-        c_proc.environment.merge('HOME' => detect_home)
-        c_proc.io.stdout = s_out
-        c_proc.io.stderr = s_err
-        c_proc.start
+        c_proc = nil
+        Lxc::Helpers.child_process_lock.synchronize do
+          c_proc = ChildProcess.build(*Shellwords.split(cmd))
+          c_proc.environment.merge('HOME' => detect_home)
+          c_proc.io.stdout = s_out
+          c_proc.io.stderr = s_err
+          c_proc.start
+        end
         begin
           c_proc.poll_for_exit(args[:timeout] || 1200)
         rescue ChildProcess::TimeoutError
@@ -228,3 +235,5 @@ class Lxc
 
   end
 end
+
+Lxc::Helpers.child_process_lock = Mutex.new

data/lib/elecksee/lxc_file_config.rb

@@ -1,145 +1,101 @@
 require 'elecksee'
+require 'attribute_struct'
 
-class Lxc
-  # Configuration file interface
-  class FileConfig
+class LxcStruct < AttributeStruct
 
-    # @return [Array]
-    attr_reader :network
-    # @return [String] path to configuration file
-    attr_reader :base
-
-    class << self
+  def network(*args, &block)
+    unless(self[:network])
+      set!(:network, ::AttributeStruct::CollapseArray.new)
+      self[:network].push(_klass_new)
+    end
+    if(self[:network].last._data[:type].is_a?(::AttributeStruct::CollapseArray))
+      val = self[:network].last._data[:type].pop
+      self[:network].push(_klass_new)
+      self[:network].last.set!(:type, val)
+    end
+    self[:network].last
+  end
 
-      # Convert object to Hash if possible
-      #
-      # @param thing [Object]
-      # @return [Hash]
-      # @note used mostly for the lxc resource within chef
-      def convert_to_hash(thing)
-        if(defined?(Chef) && thing.is_a?(Chef::Resource))
-          result = Hash[*(
-              (thing.methods - Chef::Resource.instance_methods).map{ |key|
-                unless(key.to_s.start_with?('_') || thing.send(key).nil?)
-                  [key, thing.send(key)]
-                end
-              }.compact.flatten(1)
-          )]
-        else
-          unless(thing.is_a?(Hash))
-            result = defined?(Mash) ? Mash.new : {}
-            thing.to_hash.each do |k,v|
-              result[k] = v.respond_to?(:keys) && v.respond_to?(:values) ? convert_to_hash(v) : v
-            end
-          end
-        end
-        result || thing
-      end
+  def _klass
+    ::LxcStruct
+  end
 
-      # Symbolize keys within hash
-      #
-      # @param thing [Hashish]
-      # @return [Hash]
-      def symbolize_hash(thing)
-        if(defined?(Mash))
-          Mash.new(thing)
-        else
-          result = {}
-          thing.each do |k,v|
-            result[k.to_sym] = v.is_a?(Hash) ? symbolize_hash(v) : v
-          end
-          result
-        end
-      end
+end
 
-      # Generate configuration file contents
-      #
-      # @param resource [Hashish]
-      # @return [String]
-      def generate_config(resource)
-        resource = symbolize_hash(convert_to_hash(resource))
-        config = []
-        config << "lxc.utsname = #{resource[:utsname]}"
-        if(resource[:aa_profile])
-          config << "lxc.aa_profile = #{resource[:aa_profile]}"
-        end
-        [resource[:network]].flatten.each do |net_hash|
-          nhsh = Mash.new(net_hash)
-          flags = nhsh.delete(:flags)
-          %w(type link).each do |k|
-            config << "lxc.network.#{k} = #{nhsh.delete(k)}" if nhsh[k]
-          end
-          nhsh.each_pair do |k,v|
-            config << "lxc.network.#{k} = #{v}"
-          end
-          if(flags)
-            config << "lxc.network.flags = #{flags}"
-          end
-        end
-        if(resource[:cap_drop])
-          config << "lxc.cap.drop = #{Array(resource[:cap_drop]).join(' ')}"
-        end
-        %w(include pts tty arch devttydir mount mount_entry rootfs rootfs_mount pivotdir).each do |k|
-          config << "lxc.#{k.sub('_', '.')} = #{resource[k.to_sym]}" if resource[k.to_sym]
-        end
-        prefix = 'lxc.cgroup'
-        resource[:cgroup].each_pair do |key, value|
-          if(value.is_a?(Array))
-            value.each do |val|
-              config << "#{prefix}.#{key} = #{val}"
-            end
-          else
-            config << "#{prefix}.#{key} = #{value}"
-          end
-        end
-        config.join("\n") + "\n"
-      end
+class Lxc
+  # Configuration file interface
+  class FileConfig
 
-    end
+    # @return [String] path to config file
+    attr_reader :path
+    # @return [AttrubuteStruct] config file contents
+    attr_accessor :state
 
     # Create new instance
     #
     # @param path [String]
     def initialize(path)
-      raise 'LXC config file not found' unless File.exists?(path)
       @path = path
-      @network = []
-      @base = defined?(Mash) ? Mash.new : {}
-      parse!
+      if(File.exists?(path))
+        parse!
+      else
+        @state = LxcStruct.new
+      end
+    end
+
+    # @return [Smash] hash like dump of state
+    def state_hash
+      state._dump.to_smash
+    end
+
+    # Overwrite the config file
+    #
+    # @return [Integer]
+    def write!
+      File.write(path, generate_content)
+    end
+
+    # Generate config file content from current value of state
+    #
+    # @return [String]
+    def generate_content
+      process_item(state_hash).flatten.join("\n")
     end
 
     private
 
+    # Convert item to configuration file line
+    #
+    # @param item [Object]
+    # @param parents [Array<String>] parent hash keys
+    # @return [Array<String>]
+    def process_item(item, parents=[])
+      case item
+      when Hash
+        item.map do |k,v|
+          process_item(v, parents + [k])
+        end
+      when Array
+        item.map do |v|
+          process_item(v, parents)
+        end
+      else
+        ["#{parents.join('.')} = #{item}"]
+      end
+    end
+
     # Parse the configuration file
     #
-    # @return [TrueClass]
+    # @return [AttributeStruct]
     def parse!
-      cur_net = nil
-      File.readlines(@path).each do |line|
-        if(line.start_with?('lxc.network'))
-          parts = line.split('=')
-          name = parts.first.split('.').last.strip
-          if(name.to_sym == :type)
-            @network << cur_net if cur_net
-            cur_net = Mash.new
-          end
-          if(cur_net)
-            cur_net[name] = parts.last.strip
-          else
-            raise "Expecting 'lxc.network.type' to start network config block. Found: 'lxc.network.#{name}'"
-          end
-        else
-          parts = line.split('=')
-          name = parts.first.sub('lxc.', '').strip
-          if(@base[name])
-            @base[name] = [@base[name], parts.last.strip].flatten
-          else
-            @base[name] = parts.last
-          end
-        end
+      struct = LxcStruct.new
+      struct._set_state(:value_collapse => true)
+      File.read(path).split("\n").each do |line|
+        parts = line.split('=').map(&:strip)
+        parts.last.replace("'#{parts.last}'")
+        struct.instance_eval(parts.join(' = '))
       end
-      @network << cur_net if cur_net
-      true
+      @state = struct
     end
 
   end

data/lib/elecksee/storage/overlay_directory.rb

@@ -34,7 +34,7 @@ class Lxc
       # @return [TrueClass, FalseClass]
       def create
         unless(File.directory?(overlay_path))
-          FileUtils.mkdir_p(overlay_path)
+          command("mkdir -p #{overlay_path}", :sudo => true)
           true
         else
           false

data/lib/elecksee/version.rb

@@ -1,4 +1,4 @@
 module Elecksee
   # Current library version
-  VERSION = Gem::Version.new('1.1.8')
+  VERSION = Gem::Version.new('2.0.0')
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bogo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: attribute_struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: LXC helpers