builderator 1.0.0.pre.rc.4 → 1.0.0.pre.rc.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c06c7e47e0b81e69f6a7598c4cd29735d6271b3e
-  data.tar.gz: 91a08c3ef157f08f41b898a36d98aa1d4eb79c30
+  metadata.gz: 2852a1c02024fc999ea0eb74e472a8e233d867a9
+  data.tar.gz: 248ea3c6b324305423c9fc6db5336ad9a7c25c2f
 SHA512:
-  metadata.gz: e1361c6e97f292ec9cbb0f311cd4ac6f10e7b81abbe78bab4b1c74e065c05d6553a2bcdd0159cf91f4453143e77fb3e80d5dcc70186f2b3ba1d1d5367ca940a6
-  data.tar.gz: f8a6d159aab7c6656a9e597f8e8c47bd79a944f57d1f838437881a05f42ae779a17e9da2f220ac5a10f7c4be6dd94ffdf462d7f8ac1f008426c2be5a7503e136
+  metadata.gz: 835929882dd2a9cf704b667a833eddbe6cfdaf00227636a10abdca11f1708a9e4cefa184a19c5835e910b982f8eed51e12879fff3b295d9d825dcae51fc662d1
+  data.tar.gz: fb06fff1526bc2be046757dddd479146c3ca1dce16f70d03c4173c600871821470c18900dca80f0dab4970b27c6adf8c3bf0b982beb66b738244c6cb2c8f5608

data/Buildfile

@@ -0,0 +1,4 @@
+##
+# Use Builderator to release Builderator!
+##
+autoversion.create_tags true

data/Gemfile

@@ -2,12 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in builderator.gemspec
 gemspec
-
-gem 'vagrant', :github => 'mitchellh/vagrant',
-               :tag => 'v1.7.4',
-               :group => :development
-
-group :development, :plugins do
-  gem 'vagrant-aws'
-  gem 'vagrant-omnibus'
-end

data/Gemfile.lock

@@ -1,33 +1,9 @@
-GIT
-  remote: git://github.com/mitchellh/vagrant.git
-  revision: 78ea5e4a78ce644717ab16d8001ab77430168f0f
-  tag: v1.7.4
-  specs:
-    vagrant (1.7.4)
-      bundler (>= 1.5.2, <= 1.10.5)
-      childprocess (~> 0.5.0)
-      erubis (~> 2.7.0)
-      hashicorp-checkpoint (~> 0.1.1)
-      i18n (>= 0.6.0, <= 0.8.0)
-      listen (~> 3.0.2)
-      log4r (~> 1.1.9, < 1.1.11)
-      net-scp (~> 1.1.0)
-      net-sftp (~> 2.1)
-      net-ssh (>= 2.6.6, < 2.10.0)
-      nokogiri (= 1.6.3.1)
-      rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 2.0)
-      wdm (~> 0.1.0)
-      winrm (~> 1.3)
-      winrm-fs (~> 0.2.0)
-
 PATH
   remote: .
   specs:
-    builderator (1.0.0.pre.rc.3)
+    builderator (1.0.0.pre.rc.4)
       aws-sdk (~> 2.0)
       berkshelf (~> 3.2)
-      bundler (~> 1.7.0)
       chef (~> 12.0)
       faraday_middleware (~> 0.10.0)
       ignorefile
@@ -36,7 +12,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
     addressable (2.3.8)
     ast (2.1.0)
     astrolabe (1.3.1)
@@ -114,8 +89,6 @@ GEM
       mixlib-log (~> 1.3)
       rack
       uuidtools (~> 2.1)
-    childprocess (0.5.8)
-      ffi (~> 1.0, >= 1.0.11)
     cleanroom (1.0.0)
     coderay (1.1.0)
     dep-selector-libgecode (1.0.2)
@@ -124,7 +97,6 @@ GEM
       ffi (~> 1.9)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    excon (0.45.4)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
@@ -132,144 +104,16 @@ GEM
     ffi (1.9.10)
     ffi-yajl (2.2.3)
       libyajl2 (~> 1.2)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.36.0)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.32)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-json
-      fog-local
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-aliyun (0.1.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.7.6)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.35.0)
-      builder
-      excon (~> 0.45)
-      formatador (~> 0.2)
-    fog-dynect (0.0.2)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.2.1)
-      fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.4)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.4.0)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.0.2)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-xenserver (0.2.2)
-      fog-core
-      fog-xml
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashicorp-checkpoint (0.1.4)
     hashie (3.4.3)
     highline (1.7.8)
     hitimes (1.2.3)
     httpclient (2.6.0.1)
-    i18n (0.7.0)
     ignorefile (1.1.0)
-    inflecto (0.0.2)
     ipaddress (0.8.0)
     jmespath (1.1.3)
     json (1.8.3)
     libyajl2 (1.2.0)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    little-plugger (1.1.4)
-    log4r (1.1.10)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
     method_source (0.8.2)
-    mime-types (3.0)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2015.1120)
-    mini_portile (0.6.0)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
@@ -279,9 +123,7 @@ GEM
     mixlib-shellout (2.2.5)
     multi_json (1.11.2)
     multipart-post (2.0.0)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
@@ -291,9 +133,6 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     nio4r (1.2.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    nori (2.6.0)
     octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
     ohai (8.8.1)
@@ -320,13 +159,6 @@ GEM
     rack (1.6.4)
     rainbow (2.0.0)
     rake (10.4.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.4)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     retryable (2.0.3)
     ridley (4.3.0)
       addressable
@@ -372,8 +204,6 @@ GEM
       ruby-progressbar (~> 1.7)
       tins (<= 1.6.0)
     ruby-progressbar (1.7.5)
-    rubyntlm (0.4.0)
-    rubyzip (1.1.7)
     sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
@@ -403,29 +233,10 @@ GEM
       hitimes
     tins (1.6.0)
     uuidtools (2.1.5)
-    vagrant-aws (0.6.0)
-      fog (~> 1.22)
-    vagrant-omnibus (1.4.1)
     varia_model (0.5.0)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
-    wdm (0.1.1)
-    winrm (1.3.6)
-      builder (>= 2.1.2)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.4.0)
-      uuidtools (~> 2.1.2)
-    winrm-fs (0.2.3)
-      erubis (~> 2.7)
-      logging (~> 1.6, >= 1.6.1)
-      rubyzip (~> 1.1)
-      winrm (~> 1.3.0)
     wmi-lite (1.0.0)
-    xml-simple (1.1.5)
 
 PLATFORMS
   ruby
@@ -436,6 +247,3 @@ DEPENDENCIES
   rspec (~> 3.0)
   rubocop (~> 0.35)
   thor-scmversion (= 1.7.0)
-  vagrant!
-  vagrant-aws
-  vagrant-omnibus

data/VERSION

@@ -1 +1 @@
-1.0.0-rc.4
+1.0.0-rc.5

data/bin/build

@@ -1,17 +1,4 @@
 #!/usr/bin/env ruby
-unless ENV.include?('BUNDLE_GEMFILE')
-  puts ''
-  puts '   / \\'
-  puts '  | ^ |'
-  puts "  ಠ _ ಠ  It looks like you're trying to run Builderator outside of Bundler!"
-  puts '  || ||  This is aggressively discouraged! Please re-run your command'
-  puts '  || ||  prepended with `bundle exec`'
-  puts '  || ||'
-  puts '  |  |   See http://bundler.io/ for help setting up Bundler and creating a Gemfile'
-  puts '   \\/'
-  puts ''
-  exit 1
-end
 
 require_relative '../lib/builderator/tasks'
 Builderator::Tasks::CLI.start(ARGV)

data/builderator.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'thor-scmversion', '1.7.0'
 
   spec.add_dependency 'aws-sdk', '~> 2.0'
-  spec.add_dependency 'bundler', '~> 1.7.0'
   spec.add_dependency 'berkshelf', '~> 3.2'
   spec.add_dependency 'chef', '~> 12.0'
   spec.add_dependency 'faraday_middleware', '~> 0.10.0'

data/lib/builderator/config.rb

@@ -14,7 +14,7 @@ module Builderator
       end
 
       def all_layers
-        ([GLOBAL_DEFAULTS, defaults] + layers + [overrides, argv])
+        ([defaults] + layers + [overrides, argv])
       end
 
       def defaults
@@ -47,10 +47,13 @@ module Builderator
         layers.unshift(File.from_json(path)) if ::File.exist?(path)
       end
 
-      def compile(max_iterations = 4)
+      def compile(max_iterations = 6)
         compiled.unseal
         compile_iterations = 0
 
+        ## Initialize with global defaults
+        compiled.merge(GLOBAL_DEFAULTS.compile)
+
         ## Automatically recompile while layers are dirty
         loop do
           fail "Re-compile iteration limit of #{max_iterations} has been exceeded" if compile_iterations >= max_iterations
@@ -58,8 +61,13 @@ module Builderator
           ## Reset flags before next iteration
           compiled.clean
 
-          ## Merge layers from lowest to highest
-          all_layers.each { |layer| compiled.merge(layer.compile) }
+          ## Merge layers from lowest to highest. Compile, then merge.
+          all_layers.each(&:compile)
+          all_layers.each do |layer|
+            compiled.merge(layer)
+
+            layer.policies.each { |_, policy| compiled.merge(policy) }
+          end
 
           break unless dirty?
           compile_iterations += 1
@@ -75,7 +83,7 @@ module Builderator
       end
 
       def compiled
-        @compiled ||= File.new
+        @compiled ||= File.new({}, :source => 'compiled')
       end
 
       def fetch(key, *args)

data/lib/builderator/config/attributes.rb

@@ -67,7 +67,8 @@ module Builderator
           define_method(namespace_name) do |&block|
             nodes[namespace_name] ||= namespace_class.new(
               @attributes[namespace_name],
-              :name => namespace_name, &block).compile
+              :name => namespace_name,
+              :parent => self, &block).compile
           end
         end
 
@@ -116,22 +117,38 @@ module Builderator
         self
       end
 
+      ## All dirty state should aggregate at the root node
+      def dirty
+        return @dirty if parent == self
+        parent.dirty
+      end
+
+      def dirty=(set)
+        return @dirty = set if parent == self
+        parent.dirty = set
+      end
+
+      def ==(other)
+        attributes == other.attributes
+      end
+
       attr_reader :attributes
       attr_reader :nodes
-      attr_reader :dirty
+      attr_reader :parent
 
-      def initialize(attributes = {}, &block)
+      def initialize(attributes = {}, options = {}, &block)
         @attributes = Rash.coerce(attributes)
         @nodes = {}
         @block = block
 
-        ## Track change status for comsumers
-        @dirty = false
+        ## Track change status for consumers
+        @parent = options.fetch(:parent, self)
+        self.dirty = false if parent == self
       end
 
       ## Clear dirty state flag
       def clean
-        @dirty = false
+        self.dirty = false
       end
 
       def compile
@@ -140,7 +157,7 @@ module Builderator
       end
 
       def merge(other)
-        attributes.merge!(other.attributes)
+        self.dirty |= attributes.merge!(other.attributes)
         self
       end
       alias_method :includes, :merge
@@ -165,7 +182,7 @@ module Builderator
         ## Unchanged
         return if @attributes[key] == arg
 
-        @dirty = true ## A mutation has occured
+        self.dirty |= true ## A mutation has occured
         @attributes[key] = arg
       end
 
@@ -177,7 +194,7 @@ module Builderator
 
         return if arg.empty?
 
-        @dirty = true ## A mutation has occured
+        @dirty |= true ## A mutation has occured
         attribute.push(*arg)
       end
 
@@ -227,7 +244,7 @@ module Builderator
         attr_reader :collection
 
         def initialize(attributes, options = {}, &block)
-          super(attributes, &block)
+          super(attributes, options, &block)
 
           @name = options.fetch(:name, self.class.name)
           @collection = options[:collection]
@@ -278,7 +295,8 @@ module Builderator
           self.class.namespace_class.new(
             attributes[instance_name],
             :collection => self,
-            :name => instance_name, &block)
+            :name => instance_name,
+            :parent => self, &block)
         end
         alias_method :[], :fetch
       end

data/lib/builderator/config/file.rb

@@ -30,13 +30,16 @@ module Builderator
       attr_reader :date ## Provide an authoritative, UTC-based date for any consumers
       attr_reader :source ## Where the instance was defined
       attr_reader :type ## How compile should populate attributes
+      attr_reader :policies
 
       def initialize(attributes = {}, options = {}, &block)
-        super(attributes, &block)
+        @policies = {}
 
         @date = Time.now.utc
         @type = options.fetch(:type, :code)
         @source = options.fetch(:source, nil)
+
+        super(attributes, &block)
       end
 
       def compile
@@ -46,22 +49,29 @@ module Builderator
         when :file
           instance_eval(IO.read(source), source, 0)
         when :json
-          @attributes = Rash.coerce(JSON.parse(IO.read(source)))
+          update = Rash.coerce(JSON.parse(IO.read(source)))
+
+          unless @attributes == update
+            @dirty |= true
+            @attributes = update
+          end
         else
           instance_eval(&@block) if @block
         end
 
         ## Overlay policies
-        policy.each do |_, policy|
+        policy.each do |name, policy|
           if policy.has?(:path)
             next unless ::File.exist?(policy.path)
-            merge(self.class.from_file(policy.path).compile)
-          end
+            policies[name] ||= self.class.from_file(policy.path)
 
-          if policy.has?(:json)
+          elsif policy.has?(:json)
             next unless ::File.exist?(policy.json)
-            merge(self.class.from_json(policy.json).compile)
+            policies[name] ||= self.class.from_json(policy.json)
           end
+
+          policies[name].compile
+          self.dirty |= policies[name].dirty
         end
 
         self

data/lib/builderator/config/rash.rb

@@ -47,23 +47,36 @@ module Builderator
       def merge!(other)
         fail TypeError, 'Argument other of  `Rash#merge!(other)` must be a Hash.'\
                         " Recieved #{other.class}" unless other.is_a?(Hash)
+        dirty = false
 
         other.each do |k, v|
           ## Replace `-`s with `_`s in in String keys
           k = k.gsub(/\-/, '_') if k.is_a?(String)
 
+          next if self[k] == v
+
           ## Merge Arrays
-          next self[k] |= v if fetch(k, nil).is_a?(Array) && v.is_a?(Array)
+          if fetch(k, nil).is_a?(Array) && v.is_a?(Array)
+            next if (self[k] | v) == self[k]
+
+            dirty |= true
+            next self[k] |= v
+          end
 
           ## Overwrite non-Hash values
-          next self[k] = v unless v.is_a?(Hash)
+          unless v.is_a?(Hash)
+            dirty |= true
+            next self[k] = v
+          end
 
           ## Replace `self[k]` with a new Rash unless it already is one
           self[k] = self.class.new unless fetch(k, nil).is_a?(self.class)
 
           ## Merge recursivly coerces `v` to a Rash
-          self[k].merge!(v)
+          dirty |= self[k].merge!(v)
         end
+
+        dirty
       end
 
       def to_hash

data/lib/builderator/control/cleaner.rb

@@ -90,11 +90,11 @@ module Builderator
         end
 
         def commit?
-          @commit && !@abort
+          Config.cleaner.commit && !@abort
         end
 
         def aborted?
-          @commit && @abort
+          Config.cleaner.commit && @abort
         end
 
         def exceptions

data/lib/builderator/tasks/version.rb

@@ -32,7 +32,7 @@ module Builderator
       desc 'bump TYPE [PRERELEASE_NAME]', 'Increment the package version, optionally with a named prerelease'
       def bump(type = :auto, prerelease_name = nil)
         ## Guard: Don't try to create a new version if `create_tags` is explicitly disabled
-        ## or `search_tags` is disabled as we won't have a valud current version to increment
+        ## or `search_tags` is disabled as we won't have a valid current version to increment
         unless Config.autoversion.create_tags && Config.autoversion.search_tags
           say_status :disabled, 'Tag creation is disabled for this build. Not '\
           'creating new SCM tags!', :red

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.4
+  version: 1.0.0.pre.rc.5
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
@@ -176,11 +162,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Buildfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
 - Thorfile
 - VERSION
 - bin/build
@@ -233,7 +219,6 @@ files:
 - lib/builderator/util/aws_exception.rb
 - lib/builderator/util/limit_exception.rb
 - lib/builderator/util/task_exception.rb
-- mkmf.log
 - spec/config_spec.rb
 - spec/data/Berksfile
 - spec/data/Buildfile

data/Rakefile

@@ -1 +0,0 @@
-require 'bundler/gem_tasks'

data/mkmf.log

@@ -1,4 +0,0 @@
-find_executable: checking for vagrant... -------------------- yes
-
---------------------
-