r10k 1.0.0 → 1.1.0rc1

data/lib/r10k/cli/puppetfile.rb

@@ -49,7 +49,33 @@ Puppetfile (http://bombasticmonkey.com/librarian-puppet/).
       end
     end
     self.command.add_command(Install.command)
-
+    module Check
+      def self.command
+        @cmd ||= Cri::Command.define do
+          name  'check'
+          usage 'check'
+          summary 'Try and load the Puppetfile to verify the syntax is correct.'
+          run do |opts,args,cmd|
+            puppetfile_root = Dir.getwd
+            puppetfile_path = ENV['PUPPETFILE_DIR']
+            puppetfile      = ENV['PUPPETFILE']
+            
+            puppetfile = R10K::Puppetfile.new(puppetfile_root, puppetfile_path, puppetfile)
+            begin
+              puppetfile.load
+            rescue LoadError => ex
+              $stderr.puts "ERROR: Puppetfile bad syntax"
+              ex.backtrace.each do |line|
+                  puts line
+              end
+              exit 1
+            end
+            exit 0
+          end
+        end
+      end
+    end
+    self.command.add_command(Check.command)
     module Purge
       def self.command
         @cmd ||= Cri::Command.define do

data/lib/r10k/deployment.rb

@@ -59,8 +59,10 @@ class Deployment
   private
 
   def load_sources
-    @_sources = @config.setting(:sources).map do |(name, hash)|
-      R10K::Deployment::Source.vivify(name, hash)
+    sources = @config.setting(:sources)
+    prefix = sources.length > 1
+    @_sources = sources.map do |(name, hash)|
+      R10K::Deployment::Source.vivify(name, hash, prefix)
     end
   end
 

data/lib/r10k/deployment/config.rb

@@ -57,7 +57,7 @@ class Config
   def apply_config_settings
     cachedir = setting(:cachedir)
     if cachedir
-      R10K::Git::Cache.cache_root = cachedir
+      R10K::Git::Cache.settings[:cache_root] = cachedir
     end
   end
 

data/lib/r10k/deployment/environment.rb

@@ -27,11 +27,13 @@ class Environment
   # @param [String] remote
   # @param [String] basedir
   # @param [String] dirname The directory to clone the root into, defaults to ref
-  def initialize(ref, remote, basedir, dirname = nil)
+  # @param [String] source_name An additional string which may be used with ref to build dirname
+  def initialize(ref, remote, basedir, dirname = nil, source_name = "")
     @ref     = ref
     @remote  = remote
     @basedir = basedir
-    @dirname = sanitize_dirname(dirname || ref)
+    alternate_name =  source_name.empty? ? ref : source_name + "_" + ref
+    @dirname = sanitize_dirname(dirname || alternate_name)
 
     @working_dir = R10K::Git::WorkingDir.new(@ref, @remote, @basedir, @dirname)
 
@@ -67,7 +69,7 @@ class Environment
 
   # Strip out non-word characters in an environment directory name
   #
-  # Puppet can only use word characers (letter, digit, underscore) in
+  # Puppet can only use word characters (letter, digit, underscore) in
   # environment names; this cleans up environment names to avoid traversals
   # and similar issues.
   #

data/lib/r10k/deployment/source.rb

@@ -27,20 +27,23 @@ class Source
   #   @return [Array<R10K::Deployment::Environment>] All environments for this source
   attr_reader :environments
 
-  def self.vivify(name, attrs)
+  def self.vivify(name, attrs, prefix = false)
     remote  = (attrs.delete(:remote) || attrs.delete('remote'))
     basedir = (attrs.delete(:basedir) || attrs.delete('basedir'))
+    prefix_config = (attrs.delete(:prefix) || attrs.delete('prefix'))
+    prefix_outcome = prefix_config.nil? ? prefix : prefix_config
 
     raise ArgumentError, "Unrecognized attributes for #{self.name}: #{attrs.inspect}" unless attrs.empty?
-    new(name, remote, basedir)
+    new(name, remote, basedir, prefix_outcome)
   end
 
-  def initialize(name, remote, basedir)
+  def initialize(name, remote, basedir, prefix = nil)
     @name    = name
     @remote  = remote
     @basedir = basedir
+    @prefix = prefix.nil? ? false : prefix
 
-    @cache   = R10K::Git::Cache.new(@remote)
+    @cache   = R10K::Git::Cache.generate(@remote)
 
     load_environments
   end
@@ -56,6 +59,16 @@ class Source
     @basedir
   end
 
+  def current_contents
+    dir = self.managed_directory
+    glob_part = @prefix ? @name.to_s() + '_*' : '*'
+    glob_exp = File.join(dir, glob_part)
+
+    Dir.glob(glob_exp).map do |fname|
+      File.basename fname
+    end
+  end
+
   # List all environments that should exist in the basedir for this source
   # @note This implements a required method for the Purgeable mixin
   # @return [Array<String>]
@@ -68,7 +81,11 @@ class Source
   def load_environments
     if @cache.cached?
       @environments = @cache.branches.map do |branch|
-        R10K::Deployment::Environment.new(branch, @remote, @basedir)
+        if @prefix
+          R10K::Deployment::Environment.new(branch, @remote, @basedir, nil, @name.to_s())
+        else
+          R10K::Deployment::Environment.new(branch, @remote, @basedir)
+        end
       end
     else
       @environments = []

data/lib/r10k/git/cache.rb

@@ -1,6 +1,9 @@
 require 'r10k/logging'
 require 'r10k/git/repository'
 
+require 'r10k/settings'
+require 'r10k/registry'
+
 module R10K
 module Git
 class Cache < R10K::Git::Repository
@@ -8,36 +11,16 @@ class Cache < R10K::Git::Repository
   #
   # @see man git-clone(1)
 
-  class << self
-
-    # @!attribute [r] cache_root
-    #   @return [String] The directory to use as the cache.
-    attr_writer :cache_root
+  include R10K::Settings::Mixin
 
-    def cache_root
-      @cache_root
-    end
+  def_setting_attr :cache_root, File.expand_path('~/.r10k/git')
 
-    # Memoize class instances and return existing instances.
-    #
-    # This allows objects to mark themselves as cached to prevent unnecessary
-    # cache refreshes.
-    #
-    # @param [String] remote A git remote URL
-    # @return [R10K::Synchro::Git]
-    def new(remote)
-      @repos ||= {}
-      unless @repos[remote]
-        obj = self.allocate
-        obj.send(:initialize, remote)
-        @repos[remote] = obj
-      end
-      @repos[remote]
-    end
+  def self.registry
+    @registry ||= R10K::Registry.new(self)
+  end
 
-    def clear!
-      @repos = {}
-    end
+  def self.generate(remote)
+    registry.generate(remote)
   end
 
   include R10K::Logging
@@ -46,12 +29,6 @@ class Cache < R10K::Git::Repository
   #   @return [String] The git repository remote
   attr_reader :remote
 
-  # @!attribute [r] cache_root
-  #   Where to keep the git object cache. Defaults to ~/.r10k/git if a class
-  #   level value is not set.
-  #   @return [String] The directory to use as the cache
-  attr_reader :cache_root
-
   # @!attribute [r] path
   #   @return [String] The path to the git cache repository
   attr_reader :path
@@ -61,9 +38,7 @@ class Cache < R10K::Git::Repository
   def initialize(remote)
     @remote = remote
 
-    @cache_root = self.class.cache_root || default_cache_root
-
-    @path = File.join(@cache_root, sanitized_dirname)
+    @path = File.join(settings[:cache_root], sanitized_dirname)
   end
 
   def sync
@@ -85,7 +60,11 @@ class Cache < R10K::Git::Repository
       git "fetch --prune", :git_dir => @path
     else
       logger.debug "Creating new git cache for #{@remote.inspect}"
-      FileUtils.mkdir_p cache_root unless File.exist? @cache_root
+
+      unless File.exist? settings[:cache_root]
+        FileUtils.mkdir_p settings[:cache_root]
+      end
+
       git "clone --mirror #{@remote} #{@path}"
     end
   end
@@ -119,10 +98,6 @@ class Cache < R10K::Git::Repository
     @remote.gsub(/[^@\w\.-]/, '-')
   end
 
-  def default_cache_root
-    File.expand_path('~/.r10k/git')
-  end
-
   def git_dir
     @path
   end

data/lib/r10k/git/working_dir.rb

@@ -37,7 +37,7 @@ class WorkingDir < R10K::Git::Repository
 
     @full_path = File.join(@basedir, @dirname)
 
-    @cache = R10K::Git::Cache.new(@remote)
+    @cache = R10K::Git::Cache.generate(@remote)
   end
 
   # Synchronize the local git repository.
@@ -78,6 +78,7 @@ class WorkingDir < R10K::Git::Repository
     # that doing a normal `git pull` on a directory will work.
     git "clone --reference #{@cache.path} #{@remote} #{@full_path}"
     git "remote add cache #{@cache.path}", :path => @full_path
+    git "checkout #{@ref}", :path => @full_path
   end
 
   def fetch

data/lib/r10k/module.rb

@@ -2,9 +2,8 @@ require 'r10k'
 
 module R10K::Module
 
-  # Register an inheriting  class for later generation
-  def self.included(klass)
-    klass.extend self
+  # Register an module implementation for later generation
+  def self.register(klass)
     @klasses ||= []
     @klasses << klass
   end
@@ -30,13 +29,7 @@ module R10K::Module
     end
   end
 
-  attr_accessor :name, :basedir
-
-  # @return [String] The full filesystem path to the module.
-  def full_path
-    File.join(@basedir, @name)
-  end
+  require 'r10k/module/base'
+  require 'r10k/module/git'
+  require 'r10k/module/forge'
 end
-
-require 'r10k/module/git'
-require 'r10k/module/forge'

data/lib/r10k/module/base.rb

@@ -0,0 +1,10 @@
+require 'r10k/module'
+
+class R10K::Module::Base
+  attr_accessor :name, :basedir
+
+  # @return [String] The full filesystem path to the module.
+  def full_path
+    File.join(@basedir, @name)
+  end
+end

data/lib/r10k/module/forge.rb

@@ -1,4 +1,3 @@
-require 'r10k'
 require 'r10k/module'
 require 'r10k/errors'
 require 'r10k/logging'
@@ -8,11 +7,9 @@ require 'systemu'
 require 'semver'
 require 'json'
 
-module R10K
-module Module
-class Forge
+class R10K::Module::Forge < R10K::Module::Base
 
-  include R10K::Module
+  R10K::Module.register(self)
 
   def self.implement?(name, args)
     !!(name.match %r[\w+/\w+])
@@ -40,9 +37,16 @@ class Forge
       #logger.debug1 "Module #{@full_name} already matches version #{@version}"
     elsif File.exist? metadata_path
       #logger.debug "Module #{@full_name} is installed but doesn't match version #{@version}, upgrading"
+
+      # A Pulp based puppetforge http://www.pulpproject.org/ wont support
+      # `puppet module install abc/xyz --version=v1.5.9` but puppetlabs forge
+      # will support `puppet module install abc/xyz --version=1.5.9`
+      #
+      # Removing v from the semver for constructing the command ensures
+      # compatibility across both
       cmd = []
       cmd << 'upgrade'
-      cmd << "--version=#{@version}" if @version
+      cmd << "--version=#{@version.to_s.sub(/^v/,'')}" if @version
       cmd << "--ignore-dependencies"
       cmd << @full_name
       pmt cmd
@@ -51,7 +55,7 @@ class Forge
       #logger.debug "Module #{@full_name} is not installed"
       cmd = []
       cmd << 'install'
-      cmd << "--version=#{@version}" if @version
+      cmd << "--version=#{@version.to_s.sub(/^v/,'')}" if @version
       cmd << "--ignore-dependencies"
       cmd << @full_name
       pmt cmd
@@ -101,5 +105,3 @@ class Forge
     stdout
   end
 end
-end
-end

data/lib/r10k/module/git.rb

@@ -1,12 +1,10 @@
-require 'r10k'
 require 'r10k/module'
 require 'r10k/git/working_dir'
 require 'forwardable'
 
-module R10K
-module Module
-class Git
-  include R10K::Module
+class R10K::Module::Git < R10K::Module::Base
+
+  R10K::Module.register(self)
 
   def self.implement?(name, args)
     args.is_a? Hash and args.has_key?(:git)
@@ -30,5 +28,3 @@ class Git
     @ref
   end
 end
-end
-end

data/lib/r10k/puppetfile.rb

@@ -57,6 +57,11 @@ class Puppetfile
     @forge = forge
   end
 
+  # @param [String] moduledir
+  def set_moduledir(moduledir)
+    @moduledir = moduledir
+  end
+
   # @param [String] name
   # @param [*Object] args
   def add_module(name, args)
@@ -99,6 +104,10 @@ class Puppetfile
       @librarian.set_forge(location)
     end
 
+    def moduledir(location)
+      @librarian.set_moduledir(location)
+    end
+
     def method_missing(method, *args)
       raise NoMethodError, "unrecognized declaration '#{method}'"
     end

data/lib/r10k/registry.rb

@@ -0,0 +1,32 @@
+module R10K
+
+  # R10K::Registry implements a generic object memoization container. It caches
+  # new objects and returns cached objects based on the instantiation arguments.
+  class Registry
+
+    # Initialize a new registry with a given class
+    #
+    # @param klass [Class] The class to memoize
+    # @param method [Symbol] The method name to use when creating objects.
+    #                        Defaults to :new.
+    def initialize(klass, method = :new)
+      @klass  = klass
+      @method = method
+      @instances = {}
+    end
+
+    # Create a new object, or return a memoized object.
+    #
+    # @param args [*Object] The arguments to pass to the initialize method
+    #
+    # @return [Object] A memoized instance of the registered class
+    def generate(*args)
+      @instances[args] ||= @klass.send(@method, *args)
+    end
+
+    # Clear all memoized objects
+    def clear!
+      @instances = {}
+    end
+  end
+end

data/lib/r10k/settings.rb

@@ -0,0 +1,6 @@
+module R10K
+  module Settings
+    require 'r10k/settings/container'
+    require 'r10k/settings/mixin'
+  end
+end

data/lib/r10k/settings/container.rb

@@ -0,0 +1,87 @@
+# Defines a collection for application settings
+#
+# This implements a hierarchical interface to application settings. Containers
+# can define an optional parent container that will be used for default options
+# if those options aren't set on the given container.
+class R10K::Settings::Container
+
+  # @!attribute [r] valid_keys
+  #   @return [Set<Symbol>] All valid keys defined on the container or parent container.
+  attr_accessor :valid_keys
+
+  # @param parent [R10K::Settings::Container] An optional parent container
+  def initialize(parent = nil)
+    @parent = parent
+
+    @valid_keys = Set.new
+    @settings = {}
+  end
+
+  # Look up a value in the container. The lookup checks the current container,
+  # and then falls back to the parent container if it's given.
+  #
+  # @param key [Symbol] The lookup key
+  #
+  # @return [Object, nil] The retrieved value if present.
+  #
+  # @raise [R10K::Settings::Container::InvalidKey] If the looked up key isn't
+  #   a valid key.
+  def [](key)
+    validate_key! key
+
+    if @settings[key]
+      @settings[key]
+    elsif @parent and (pkey = @parent[key])
+      @settings[key] = pkey
+      pkey
+    end
+  end
+
+  # Set a value on the container
+  #
+  # @param key [Symbol] The lookup key
+  # @param value [Object] The value to store in the container
+  #
+  # @raise [R10K::Settings::Container::InvalidKey] If the looked up key isn't
+  #   a valid key.
+  def []=(key, value)
+    validate_key! key
+
+    @settings[key] = value
+  end
+
+  # Define a valid container key
+  #
+  # @note This should only be used by {#R10K::Settings::ClassSettings}
+  #
+  # @param key [Symbol]
+  # @return [void]
+  def add_valid_key(key)
+    @valid_keys.add(key)
+  end
+
+  # Determine if a key is a valid setting.
+  #
+  # @param key [Symbol]
+  #
+  # @return [true, false]
+  def valid_key?(key)
+    if @valid_keys.include?(key)
+      true
+    elsif @parent and @parent.valid_key?(key)
+      @valid_keys.add(key)
+      true
+    end
+  end
+
+  private
+
+  def validate_key!(key)
+    unless valid_key?(key)
+      raise InvalidKey, "Key #{key} is not a valid key"
+    end
+  end
+
+  # @api private
+  class InvalidKey < StandardError; end
+end

data/lib/r10k/settings/mixin.rb

@@ -0,0 +1,45 @@
+module R10K::Settings::Mixin
+
+  def self.included(klass)
+    klass.send(:include, InstanceMethods)
+    klass.send(:extend, ClassMethods)
+  end
+
+  module InstanceMethods
+
+    # @return [R10K::Settings::Container] A settings container for the given instance.
+    def settings
+      @settings ||= R10K::Settings::Container.new(self.class.settings)
+    end
+  end
+
+  module ClassMethods
+
+    # Define a setting and optional default on the extending class.
+    #
+    # @param key [Symbol]
+    # @param default [Object]
+    #
+    # @return [void]
+    def def_setting_attr(key, default = nil)
+      defaults.add_valid_key(key)
+      defaults[key] = default if default
+    end
+
+    # A singleton settings container for storing immutable default configuration
+    # on the extending class.
+    #
+    # @return [R10K::Settings::Container]
+    def defaults
+      @defaults ||= R10K::Settings::Container.new
+    end
+
+    # A singleton settings container for storing manual setting configurations
+    # on the extending class.
+    #
+    # @return [R10K::Settings::Container]
+    def settings
+      @settings ||= R10K::Settings::Container.new(defaults)
+    end
+  end
+end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.0.0'
+  VERSION = '1.1.0rc1'
 end

data/spec/fixtures/module/forge/eight_hundred/Modulefile

@@ -0,0 +1,8 @@
+name    'branan-eight_hundred'
+version '8.0.0'
+source  'https://github.com/branan/puppet-module-eight_hundred'
+author  'Branan Purvine-Riley'
+license 'Apache License 2.0'
+summary '800 modules! WOOOOOOO!'
+description '800 modules! WOOOOOOOOOOOOOOOOOO!'
+project_page 'https://github.com/branan/puppet-module-eight_hundred'

data/spec/fixtures/module/forge/eight_hundred/metadata.json

@@ -0,0 +1,19 @@
+{
+  "checksums": {
+    "Modulefile": "1e780d794bcd6629dc3006129fc02edf"
+  },
+  "license": "Apache License 2.0",
+  "types": [
+
+  ],
+  "version": "8.0.0",
+  "dependencies": [
+
+  ],
+  "summary": "800 modules! WOOOOOOO!",
+  "source": "https://github.com/branan/puppet-module-eight_hundred",
+  "description": "800 modules! WOOOOOOOOOOOOOOOOOO!",
+  "author": "Branan Purvine-Riley",
+  "name": "branan-eight_hundred",
+  "project_page": "https://github.com/branan/puppet-module-eight_hundred"
+}

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'r10k'
+
+PROJECT_ROOT = File.expand_path('..', File.dirname(__FILE__))
+
+RSpec.configure do |config|
+  # Filter out integration tests by default
+  #
+  # To run integration tests, run `rspec --tag integration`
+  config.filter_run_excluding :integration => true
+end

data/spec/unit/deployment/environment_spec.rb

@@ -11,6 +11,11 @@ describe R10K::Deployment::Environment do
       subject.dirname.should == 'master'
     end
 
+    it 'uses the ref and a provided source name in the default dirname' do
+      subject = described_class.new(ref, remote, '/tmp', nil, "the")
+      subject.dirname.should == 'the_master'
+    end
+
     it 'allows a specific dirname to be set' do
       subject = described_class.new(ref, remote, '/tmp', 'sourcename_master')
       subject.dirname.should == 'sourcename_master'

data/spec/unit/deployment/source_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'r10k/deployment/source'
+
+describe R10K::Deployment::Source do
+  let(:name) { 'do_not_name_a_branch_this' }
+  let(:remote) { 'git://github.com/adrienthebo/r10k-fixture-repo' }
+  let(:basedir)    { '/tmp' }
+
+  describe 'environments' do
+    it 'uses the name as a prefix when told' do
+      subject = described_class.new(name, remote, basedir, true)
+      subject.fetch_remote()
+      subject.environments.length.should  > 0
+      subject.environments.first.dirname.should start_with name
+    end
+
+    it 'avoids using the name as a prefix when told' do
+      subject = described_class.new(name, remote, basedir, false)
+      subject.fetch_remote()
+      subject.environments.length.should  > 0
+      subject.environments.first.dirname.should_not start_with name
+    end
+  end
+end

data/spec/unit/git/working_dir_spec.rb

@@ -2,10 +2,6 @@ require 'spec_helper'
 
 describe R10K::Git::WorkingDir do
 
-  before do
-    R10K::Git::Cache.stubs(:cache_root).returns '/tmp'
-  end
-
   describe "initializing" do
     it "generates a new cache for the remote" do
       wd = described_class.new('master', 'git://github.com/adrienthebo/r10k-fixture-repo', '/tmp')

data/spec/unit/module/forge_spec.rb

@@ -4,12 +4,12 @@ require 'spec_helper'
 
 describe R10K::Module::Forge do
   before :each do
-    Object.expects(:systemu).never
+    allow_any_instance_of(Object).to receive(:systemu).and_raise "Tests should never invoke system calls"
   end
 
   before :each do
-    s = stub(:debug2 => nil, :debug1 => nil, :debug => nil, :info => nil)
-    described_class.any_instance.stubs(:logger).returns s
+    log = double('stub logger').as_null_object
+    described_class.any_instance.stub(:logger).and_return log
   end
 
   describe "implementing the Puppetfile spec" do
@@ -54,9 +54,8 @@ describe R10K::Module::Forge do
       its(:version) { should eq 'v8.0.0' }
 
       it "should try to upgrade the module" do
-        # "v80.0.0" ? Seriously? Where did the "v" come from?
-        expected = %w{upgrade --version=v80.0.0 --ignore-dependencies branan/eight_hundred}
-        subject.expects(:pmt).with(expected)
+        expected = %w{upgrade --version=80.0.0 --ignore-dependencies branan/eight_hundred}
+        expect(subject).to receive(:pmt).with(expected)
         subject.sync
       end
     end
@@ -65,12 +64,12 @@ describe R10K::Module::Forge do
       subject { described_class.new('branan/eight_hundred', fixture_modulepath, '7.0.0') }
 
       it { should_not be_insync }
-      its(:version) { should eq 'v8.0.0' }
+      its(:version) { should eq '8.0.0' }
 
       it "should try to downgrade the module" do
         # Again with the magical "v" prefix to the version.
-        expected = %w{upgrade --version=v7.0.0 --ignore-dependencies branan/eight_hundred}
-        subject.expects(:pmt).with(expected)
+        expected = %w{upgrade --version=7.0.0 --ignore-dependencies branan/eight_hundred}
+        expect(subject).to receive(:pmt).with(expected)
         subject.sync
       end
     end
@@ -82,8 +81,8 @@ describe R10K::Module::Forge do
       its(:version) { should eq SemVer::MIN }
 
       it "should try to install the module" do
-        expected = %w{install --version=v8.0.0 --ignore-dependencies branan/eight_hundred}
-        subject.expects(:pmt).with(expected)
+        expected = %w{install --version=8.0.0 --ignore-dependencies branan/eight_hundred}
+        expect(subject).to receive(:pmt).with(expected)
         subject.sync
       end
     end

data/spec/unit/registry_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+require 'r10k/registry'
+
+describe R10K::Registry do
+
+  describe "setting up a new registry" do
+    let(:klass) do
+      dubs = double('test class')
+      allow(dubs).to receive(:new) { |*args| args }
+      dubs
+    end
+
+    it "can create new objects" do
+      registry = described_class.new(klass)
+      expect(registry.generate).to eq []
+    end
+
+    describe "defining object arity" do
+
+      it "handles unary objects" do
+        expect(klass).to receive(:new).with(:foo)
+
+        registry = described_class.new(klass)
+        expect(registry.generate(:foo)).to eq [:foo]
+      end
+
+      it "handles ternary objects" do
+        expect(klass).to receive(:new).with(:foo, :bar, :baz)
+
+        registry = described_class.new(klass)
+        expect(registry.generate(:foo, :bar, :baz)).to eq [:foo, :bar, :baz]
+      end
+
+      it 'handles n-ary objects' do
+        args = %w[a bunch of arbitrary objects]
+        expect(klass).to receive(:new).with(*args)
+
+        registry = described_class.new(klass)
+        expect(registry.generate(*args)).to eq args
+      end
+
+      it 'fails when the required arguments are not matched' do
+        expect(klass).to receive(:new).and_raise ArgumentError, "not enough args"
+
+        registry = described_class.new(klass)
+        expect { registry.generate('arity is hard') }.to raise_error ArgumentError, "not enough args"
+      end
+    end
+
+    it "can specify the constructor method" do
+      expect(klass).to receive(:from_json).and_return "this is json, right?"
+
+      registry = described_class.new(klass, :from_json)
+      expect(registry.generate).to eq "this is json, right?"
+    end
+  end
+
+
+  it "returns a memoized object if it's been created before" do
+    registry = described_class.new(String)
+    first = registry.generate "bam!"
+    second = registry.generate "bam!"
+
+    expect(first.object_id).to eq second.object_id
+  end
+
+  it 'can clear registered objects' do
+    registry = described_class.new(String)
+
+    first = registry.generate "bam!"
+    registry.clear!
+    second = registry.generate "bam!"
+
+    expect(first.object_id).to_not eq second.object_id
+
+  end
+end

data/spec/unit/settings/container_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+require 'r10k/settings'
+
+describe R10K::Settings::Container do
+
+  describe 'validating keys' do
+    it 'can add new valid keys' do
+      subject.add_valid_key(:v)
+      subject[:v]
+    end
+
+    it 'can check if a key is valid' do
+      subject.add_valid_key(:v)
+      expect(subject.valid_key?(:v)).to be_true
+    end
+
+    it 'can list all valid keys' do
+      subject.add_valid_key(:v)
+      subject.add_valid_key(:w)
+
+      expect(subject.valid_keys).to include :v
+      expect(subject.valid_keys).to include :w
+    end
+  end
+
+  describe 'specifying settings' do
+    it 'fails if a setting application uses an invalid key' do
+      expect { subject[:invalid] = 'fail' }.to raise_error R10K::Settings::Container::InvalidKey
+    end
+
+    it 'can look up values that it sets' do
+      subject.add_valid_key :v
+      subject[:v] = 'set'
+      expect(subject[:v]).to eq 'set'
+    end
+  end
+
+  describe 'looking up settings' do
+    before do
+      subject.add_valid_key :v
+    end
+
+    it 'fails if a setting lookup uses an invalid key' do
+      expect { subject[:invalid] }.to raise_error R10K::Settings::Container::InvalidKey
+    end
+
+    it 'returns nil if a key is valid but no setting is present' do
+      expect(subject[:v]).to be_nil
+    end
+
+    describe 'with a parent container' do
+      let(:parent) { described_class.new.tap { |p| p.add_valid_key :v } }
+      subject { described_class.new(parent) }
+
+      it 'uses its setting over a parent value' do
+        subject[:v] = 'child'
+        parent[:v] = 'parent'
+        expect(subject[:v]).to eq 'child'
+      end
+
+      it 'falls back to the parent value if it does not have a value' do
+        parent[:v] = 'parent'
+        expect(subject[:v]).to eq 'parent'
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,27 +106,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.5
-description: ! "    R10K is an implementation of the Dynamic Puppet environments based
-  on git repositories\n    as described in http://puppetlabs.com/blog/git-workflow-and-puppet-environments/.
-  It\n    aggressively caches and tries to minimize network activity to ensure that
-  interactive\n    deployment is as fast as possible.\n"
+        version: 2.14.0
+description: ! "    R10K provides a general purpose toolset for deploying Puppet environments
+  and modules.\n    It implements the Puppetfile format and provides a native implementation
+  of Puppet\n    dynamic environments.\n"
 email: adrien@somethingsinistral.net
 executables:
 - r10k
@@ -137,7 +120,9 @@ files:
 - lib/r10k.rb
 - lib/r10k/errors.rb
 - lib/r10k/logging.rb
+- lib/r10k/registry.rb
 - lib/r10k/deployment.rb
+- lib/r10k/settings.rb
 - lib/r10k/git/errors.rb
 - lib/r10k/git/cache.rb
 - lib/r10k/git/working_dir.rb
@@ -152,7 +137,6 @@ files:
 - lib/r10k/deployment/config.rb
 - lib/r10k/deployment/source.rb
 - lib/r10k/util/purgeable.rb
-- lib/r10k/util/interp.rb
 - lib/r10k/cli/environment.rb
 - lib/r10k/cli/environment/list.rb
 - lib/r10k/cli/environment/deploy.rb
@@ -165,19 +149,27 @@ files:
 - lib/r10k/cli/module/list.rb
 - lib/r10k/cli/module/deploy.rb
 - lib/r10k/cli/version.rb
+- lib/r10k/settings/container.rb
+- lib/r10k/settings/mixin.rb
 - lib/r10k/task/environment.rb
 - lib/r10k/task/deployment.rb
 - lib/r10k/task/module.rb
 - lib/r10k/task/puppetfile.rb
 - lib/r10k/task.rb
+- lib/r10k/module/base.rb
 - lib/r10k/module/forge.rb
 - lib/r10k/module/git.rb
 - lib/r10k/version.rb
 - lib/semver.rb
+- spec/spec_helper.rb
+- spec/fixtures/module/forge/eight_hundred/metadata.json
+- spec/fixtures/module/forge/eight_hundred/Modulefile
+- spec/unit/registry_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/git/working_dir_spec.rb
-- spec/unit/git/cache_spec.rb
 - spec/unit/deployment/environment_spec.rb
+- spec/unit/deployment/source_spec.rb
+- spec/unit/settings/container_spec.rb
 - spec/unit/module/forge_spec.rb
 homepage: http://github.com/adrienthebo/r10k
 licenses: []
@@ -194,18 +186,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Dynamic Puppet environments with Git
+summary: Puppet environment and module deployment
 test_files:
+- spec/unit/registry_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/git/working_dir_spec.rb
-- spec/unit/git/cache_spec.rb
 - spec/unit/deployment/environment_spec.rb
+- spec/unit/deployment/source_spec.rb
+- spec/unit/settings/container_spec.rb
 - spec/unit/module/forge_spec.rb
+has_rdoc: 

data/lib/r10k/util/interp.rb

@@ -1,25 +0,0 @@
-
-module R10K; end
-module R10K::Util; end
-
-module R10K::Util::Interp
-
-  # Interpolate a string with a given scope
-  #
-  # @param [String] string
-  # @param [Hash]   scope
-  #
-  # @return [String]
-  def interpolate_string(string, scope)
-
-    interp = string.clone
-
-    while (matchdata = interp.match /%\{.+?\}/)
-      var_name = matchdata[1].intern
-      var_data = scope[var_name]
-      interp.gsub!(/%\{#{var_name}\}/, var_data)
-    end
-
-    interp
-  end
-end

data/spec/unit/git/cache_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe R10K::Git::Cache, 'memoizing objects' do
-
-  it "returns the same object when a remote is duplicated" do
-    first  = described_class.new('foo')
-    second = described_class.new('foo')
-
-    first.should be second
-  end
-
-  it "wipes the memoized objects when .clear! is called" do
-    first = described_class.new('foo')
-    described_class.clear!
-    second = described_class.new('foo')
-
-    first.should_not be second
-  end
-end
-
-describe R10K::Git::Cache do
-
-  after do
-    described_class.clear!
-  end
-
-  describe 'setting the cache root' do
-    it 'defaults to ~/.r10k/git' do
-      described_class.new('foo').cache_root.should match %r[/\.r10k/git]
-    end
-
-    it 'uses the class cache root if set' do
-      described_class.stubs(:cache_root).returns '/var/spool/r10k'
-      described_class.new('foo').cache_root.should == '/var/spool/r10k'
-    end
-  end
-end