puppet-armature 0.3.0 → 0.4.0

data/test/puppetfile_test.rb

@@ -0,0 +1,41 @@
+require 'minitest/autorun'
+require 'helpers'
+
+class PuppetfileTest < Minitest::Test
+  include ArmatureTestHelpers
+
+  def test_empty
+    with_temp_dir("puppetfile") do
+      parse_puppetfile("")
+    end
+  end
+
+  def test_one_module
+    with_temp_dir("puppetfile") do
+      results = parse_puppetfile(<<-PUPPETFILE)
+        mod "interesting", :git=>"#{repo_path("foo")}"
+      PUPPETFILE
+
+      assert_equal(["interesting"], results.keys(),
+        "Modules incorrect")
+    end
+  end
+
+  def test_bad_module_name
+    with_temp_dir("puppetfile") do
+      assert_raises(Armature::Environments::InvalidNameError) do
+        parse_puppetfile(<<-PUPPETFILE)
+          mod "./foo", :git=>"#{repo_path("foo")}"
+        PUPPETFILE
+      end
+    end
+  end
+
+private
+  def parse_puppetfile(contents)
+    @cache = Armature::Cache.new("cache")
+    repo_init("foo")
+    File.write("Puppetfile", contents)
+    Armature::Puppetfile.new(@cache).include("Puppetfile")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-armature
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Parks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -72,14 +72,22 @@ files:
 - lib/armature.rb
 - lib/armature/cache.rb
 - lib/armature/environments.rb
-- lib/armature/gitrepo.rb
+- lib/armature/errors.rb
 - lib/armature/puppetfile.rb
+- lib/armature/ref/base.rb
+- lib/armature/ref/identity.rb
+- lib/armature/ref/immutable.rb
+- lib/armature/ref/mutable.rb
+- lib/armature/repo.rb
+- lib/armature/repo/forge.rb
+- lib/armature/repo/git.rb
 - lib/armature/run.rb
 - lib/armature/util.rb
 - lib/armature/version.rb
 - puppet-armature.gemspec
 - test/deploy_test.rb
 - test/helpers.rb
+- test/puppetfile_test.rb
 homepage: https://github.com/danielparks/armature
 licenses:
 - BSD-2-Clause
@@ -101,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Deploy Puppet environments and manage modules

data/lib/armature/gitrepo.rb

@@ -1,139 +0,0 @@
-module Armature
-  class RefError < StandardError
-  end
-
-  class GitRepo
-    attr_reader :name
-
-    def initialize(git_dir, name)
-      @git_dir = git_dir
-      @name = name
-      @fetched = false
-      @logger = Logging.logger[self]
-      @ref_cache = {}
-    end
-
-    def url
-      @url ||= git("config", "--get", "remote.origin.url").chomp()
-    end
-
-    def freshen
-      if ! @fetched
-        freshen!
-        true
-      else
-        false
-      end
-    end
-
-    def freshen!
-      @logger.info("Fetching from #{url}")
-      Armature::Util::lock @git_dir, File::LOCK_EX, "fetch" do
-        git "remote", "update", "--prune"
-      end
-      @ref_cache = {}
-      @fetched = true
-    end
-
-    def git(*arguments)
-      # This accepts a hash of options as the last argument
-      options = if arguments.last.is_a? Hash then arguments.pop else {} end
-      options = Armature::Util.process_options(options, { :work_dir => nil }, {})
-
-      if options[:work_dir]
-        work_dir_arguments = [ "--work-tree=" + options[:work_dir] ]
-      else
-        work_dir_arguments = []
-      end
-
-      command = [ "git", "--git-dir=" + @git_dir ] \
-        + work_dir_arguments \
-        + arguments
-
-      Armature::Run.command(*command)
-    end
-
-    def get_branches()
-      freshen()
-      data = git("for-each-ref",
-          "--format", "%(objectname) %(refname)",
-          "refs/heads")
-      lines = data.split(/[\r\n]/).reject { |line| line == "" }
-
-      lines.map do |line|
-        sha, ref = line.split(' ', 2)
-        name = ref.sub("refs/heads/", "")
-        @ref_cache[ref] = [:mutable, sha, ref, "branch", name]
-        name
-      end
-    end
-
-    def ref_type(ref)
-      ref_info(ref)[0]
-    end
-
-    def ref_identity(ref)
-      ref_info(ref)[1]
-    end
-
-    def canonical_ref(ref)
-      ref_info(ref)[2]
-    end
-
-    def ref_human_name(ref)
-      info = ref_info(ref)
-
-      "#{info[3]} '#{info[4]}'"
-    end
-
-  private
-
-    # Get information about ref, checking the cache first
-    def ref_info(ref)
-      if ! @ref_cache[ref]
-        freshen_ref_cache(ref)
-      end
-
-      @ref_cache[ref]
-    end
-
-    # Get information about a ref and put it in the cache
-    def freshen_ref_cache(ref)
-      if ref.start_with? "refs/heads/"
-        @ref_cache[ref] = [:mutable, rev_parse!(ref), ref, "branch", ref.sub("refs/heads/", "")]
-      elsif ref.start_with? "refs/tags/"
-        @ref_cache[ref] = [:immutable, rev_parse!(ref), ref, "tag", ref.sub("refs/tags/", "")]
-      elsif ref.start_with? "refs/"
-        @ref_cache[ref] = [:mutable, rev_parse!(ref), ref, "ref", ref]
-      elsif sha = rev_parse("refs/heads/#{ref}")
-        @ref_cache["refs/heads/#{ref}"] = [:mutable, sha, "refs/heads/#{ref}", "branch", ref]
-        @ref_cache[ref] = @ref_cache["refs/heads/#{ref}"]
-      elsif sha = rev_parse("refs/tags/#{ref}")
-        @ref_cache["refs/tags/#{ref}"] = [:immutable, sha, "refs/tags/#{ref}", "tag", ref]
-        @ref_cache[ref] = @ref_cache["refs/tags/#{ref}"]
-      elsif sha = rev_parse(ref)
-        if sha == ref
-          @ref_cache[ref] = [:identity, sha, ref, "revision", ref]
-        else
-          @ref_cache[ref] = [:mutable, sha, ref, "ref", ref]
-        end
-      else
-        raise RefError.new("no such ref '#{ref}' in repo '#{url}'")
-      end
-    end
-
-    # Get the sha for a ref, or nil if it doesn't exist
-    def rev_parse(ref)
-      rev_parse!(ref)
-    rescue RefError
-      nil
-    end
-
-    # Get the sha for a ref, or raise if it doesn't exist
-    def rev_parse!(ref)
-      git("rev-parse", "--verify", "#{ref}^{commit}").chomp
-    rescue Armature::Run::CommandFailureError
-      raise RefError.new("no such ref '#{ref}' in repo '#{url}'")
-    end
-  end
-end