librarian-puppet-simple.haf 0.1.0 → 0.1.1

data/lib/librarian/puppet/simple/installer.rb

@@ -23,17 +23,14 @@ module Librarian
         def install!
           each_module do |repo|
             print_verbose "\n##### processing module #{repo[:name]}..."
+            # module path is where ALL the modules go, not this particular one
             module_path = module_path()
-            if repo[:subdir] 
-              module_path = File.join(module_path, repo[:subdir])
-              FileUtils.mkdir_p(module_path) unless File.exists?(module_path)
-            end
-            module_dir = File.join(module_path, repo[:name])
+            module_dir = File.join(module_path, repo[:subdir] || repo[:name])
 
             unless File.exists?(module_dir)
               case
               when repo[:git]
-                install_git module_path, repo[:name], repo[:git], repo[:ref]
+                install_git module_path, repo[:name], repo[:git], repo[:ref], repo[:subdir]
               when repo[:tarball]
                 install_tarball module_path, repo[:name], repo[:tarball]
               else
@@ -48,15 +45,17 @@ module Librarian
         private
 
         # installs sources that are git repos
-        def install_git(module_path, module_name, repo, ref = nil)
-          module_dir = File.join(module_path, module_name)
+        def install_git(module_path, module_name, repo, ref = nil, subdir = nil)
+          folder_name = subdir || module_name
+          module_dir = File.join(module_path, folder_name)
 
           Dir.chdir(module_path) do
             print_verbose "cloning #{repo}"
-            system_cmd("git clone #{repo} #{module_name}")
-            Dir.chdir(module_dir) do
+            system_cmd("git clone #{repo} #{folder_name}")
+            Dir.chdir(folder_name) do
               system_cmd('git branch -r')
               system_cmd("git checkout #{ref}") if ref
+              system_cmd("git filter-branch --subdirectory-filter #{subdir}") if subdir
             end
           end
         end

data/lib/librarian/puppet/simple/util.rb

@@ -10,7 +10,7 @@ module Librarian
         def forge(repo)
           # this does nothing atm
         end
-        # figure out what directory we are working out og
+        # figure out what directory we are working out of
         def base_dir
           @base_dir ||= Dir.pwd
         end

data/lib/librarian/puppet/simple/version.rb

@@ -1,7 +1,7 @@
 module Librarian
   module Puppet
     module Simple
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/spec/functional/install_spec.rb

@@ -22,30 +22,33 @@ describe "Functional - Install" do
 
     before :each do
       temp_directory = Dir.mktmpdir
-      Dir.entries(temp_directory).should =~ ['.', '..']
+      Dir.entries(temp_directory).should =~ %w|. ..|
       FileUtils.touch File.join(temp_directory, 'trashfile')
-      Dir.entries(temp_directory).should =~ ['.', '..', 'trashfile']
+      Dir.entries(temp_directory).should =~ %w|. .. trashfile|
     end
 
     after :each do
       FileUtils.rm_rf temp_directory
     end
 
-    it "install the modules in a temp directory" do
+    it "install the modules in a temp directory", :type => 'integration' do
       output, status = execute_captured("bin/librarian-puppet install --path=#{temp_directory} --puppetfile=spec/fixtures/Puppetfile")
 
       status.should == 0
       Dir.entries(temp_directory).should =~ %w|. .. apache ntp trashfile dnsclient testlps subdir-A|
+      Dir.entries(File.join(temp_directory, 'subdir-A')).should =~ %w|. .. .git Hello.txt|
     end
 
-    it "with --clean it cleans the directory before installing the modules in a temp directory" do
+    
+
+    it "with --clean it cleans the directory before installing the modules in a temp directory", :type => 'integration' do
       output, status = execute_captured("bin/librarian-puppet install --clean --path=#{temp_directory} --puppetfile=spec/fixtures/Puppetfile")
 
       status.should == 0
       Dir.entries(temp_directory).should =~ %w|. .. apache ntp dnsclient testlps subdir-A|
     end
 
-    it "with --verbose it outputs progress messages" do
+    it "with --verbose it outputs progress messages", :type => 'integration' do
       output, status = execute_captured("bin/librarian-puppet install --verbose --path=#{temp_directory} --puppetfile=spec/fixtures/Puppetfile")
 
       status.should == 0
@@ -57,12 +60,12 @@ describe "Functional - Install" do
 
       before :each do
         temp_directory = Dir.mktmpdir
-        Dir.entries(temp_directory).should =~ ['.', '..']
+        Dir.entries(temp_directory).should =~ %w|. ..|
         FileUtils.touch File.join(temp_directory, 'apache')
-        Dir.entries(temp_directory).should =~ ['.', '..', 'apache']
+        Dir.entries(temp_directory).should =~ %w|. .. apache|
       end
 
-      it 'without clean it should only install ntp' do
+      it 'without clean it should only install ntp', :type => 'integration' do
         output, status = execute_captured("bin/librarian-puppet install --verbose --path=#{temp_directory} --puppetfile=spec/fixtures/Puppetfile")
         status.should == 0
         output.should include('Module apache already installed')

data/spec/spec_helper.rb

@@ -9,7 +9,12 @@ require 'open3'
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
+
+  # if ENV['INTEGRATION']
+  #   config.filter_run :type => 'integration'
+  # else
+  #   config.filter_run_excluding :type => 'integration'
+  # end
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
@@ -22,4 +27,4 @@ RSpec.configure do |config|
     condensed = stdout.readlines.join + stderr.readlines.join
     [condensed, $?.exitstatus]
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-simple.haf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: