librarian-puppet-simple 0.0.1 → 0.0.2

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

@@ -7,8 +7,10 @@ module Librarian
     module Simple
       class CLI < Thor
 
+        include Librarian::Puppet::Simple::Util
         include Librarian::Puppet::Simple::Installer
         include Librarian::Puppet::Simple::Iterator
+
         class_option :verbose, :type => :boolean,
                      :desc => 'verbose output for executed commands'
 
@@ -44,7 +46,7 @@ module Librarian
         desc 'git_status', 'determine the current status of checked out git repos'
         def git_status
           @custom_module_path = options[:path]
-          # polulate @modules
+          # populate @modules
           eval(File.read(File.expand_path(options[:puppetfile])))
           each_module_of_type(:git) do |repo|
             Dir.chdir(File.join(module_path, repo[:name])) do
@@ -60,27 +62,197 @@ module Librarian
         end
 
         desc 'dev_setup', 'adds development r/w remotes to each repo (assumes remote has the same name as current repo)'
-        method_option :remote, :type => :string, :desc => "Account name of remote to add"
         def dev_setup(remote_name)
+          @custom_module_path = options[:path]
+          # populate @modules
+          eval(File.read(File.expand_path(options[:puppetfile])))
           each_module_of_type(:git) do |repo|
-            remotes = system_cmd('git remote')
-            if remotes.include?(remote_name)
-              puts "Did not have to add remote #{remote_name} to #{repo[:name]}"
-            elsif ! remotes.include?('origin')
-              raise(TestException, "Repo #{repo[:name]} has no remote called origin, failing")
-            else
-              remote_url = git_cmd('remote show origin').detect {|x| x =~ /\s+Push\s+URL: / }
-              if remote_url =~ /(git|https?):\/\/(.+)\/(.+)?\/(.+)/
-                url = "git@#{$2}:#{remote_name}/#{$4}"
+            Dir.chdir(File.join((options[:path] || 'modules'), repo[:name])) do
+              print_verbose "Adding development remote for git repo #{repo[:name]}"
+              remotes = system_cmd('git remote')
+              if remotes.include?(remote_name)
+                puts "Did not have to add remote #{remote_name} to #{repo[:name]}"
+              elsif ! remotes.include?('origin')
+                raise(TestException, "Repo #{repo[:name]} has no remote called origin, failing")
               else
-                puts "remote_url #{remote_url} did not have the expected format. weird..."
+                remote_url = system_cmd('git remote show origin').detect {|x| x =~ /\s+Push\s+URL: / }
+                if remote_url =~ /(git|https?):\/\/(.+)\/(.+)?\/(.+)/
+                  url = "git@#{$2}:#{remote_name}/#{$4}"
+                  puts "Adding remote #{remote_name} as #{url}"
+                  system_cmd("git remote add #{remote_name} #{url}")
+                elsif remote_url =~ /^git@/
+                  puts "Origin is already a read/write remote, skipping b/c this is unexpected"
+                else
+                  puts "remote_url #{remote_url} did not have the expected format. weird..."
+                end
               end
-              puts "Adding remote #{remote_name} as #{url}"
-              git_cmd("remote add #{remote_name} #{url}")
             end
           end
         end
 
+        #
+        # I am not sure if anyone besides me (Dan Bode) should use this command.
+        # It is specifically for the use case where you are managing downstream versions
+        # of Puppet modules, where you want to track the relationship between your downstream
+        # forks and upstream.
+        # It required a specially formatted Puppetfile that expects an environment variable called
+        # repo_to_use that accepts the values 'upstream' and 'downstream'. It should use that environment
+        # variable to be able to generate either the upstream or downstream set of repos.
+        #
+        # Given those requirements, it can be used to compare the revision history differences betwee
+        # those commits.
+        #
+        desc 'compare_repos', 'compares the specified upstream and downstream repos'
+        method_option :output_file, :type => :string,
+          :desc => "Name of Puppetfile to save the results as"
+        method_option :ignore_merges, :type => :boolean,
+          :desc => 'Indicates that merge commits should be ignored'
+        method_option :show_diffs, :type => :boolean,
+          :desc => 'Show code differences of divergent commits (add -u)'
+        # I was really just using this for testing
+        # not sure if end users need it
+        method_option :existing_tmp_dir, :type => :string,
+          :desc => 'Uses an existing directory. Assumes the downstream repos have already been populated.'
+        method_option :upstream_only, :type => :boolean,
+          :desc => 'Only show commits that are only in the upstream'
+        method_option :downstream_only, :type => :boolean,
+          :desc => 'Only show commits that are only in downstream'
+        method_option :oneline, :type => :boolean,
+          :desc => 'Condense log output to one line'
+
+
+        def compare_repos
+
+          repo_hash = {}
+          @verbose            = options[:verbose]
+          abort('path not supported by compare_repos command') if options[:path]
+          if options[:downstream_only] and options[:upstream_only]
+            abort('Cannot specify both downstream_only and upstream_only')
+          end
+
+          # create path where code will be stored
+          if options[:existing_tmp_dir]
+            path = options[:existing_tmp_dir]
+          else
+            path = File.join('.tmp', Time.now.strftime("%Y_%m_%d_%H_%S"))
+          end
+
+          FileUtils.mkdir_p(path)
+          @custom_module_path = path
+
+          # install the downstream modules in our tmp directory and build out a hash
+          downstream = build_puppetfile_hash('downstream', !options[:existing_tmp_dir])
+          # just build a hash of the downstream modules
+          upstream   = build_puppetfile_hash('upstream', false)
+
+          unless ( (downstream.keys - upstream.keys) == [] and
+                   (upstream.keys - downstream.keys)
+                 )
+            abort('Your Puppetfile did not produce the same upstream and downstream repos, this is not yet supported')
+          else
+
+            upstream.each do |us_name, us_repo|
+              # compare to see if the source of revisions are the same
+              ds_repo = downstream[us_name]
+              if ds_repo[:git] == us_repo[:git] and ds_repo[:ref] == us_repo[:ref]
+                print_verbose("\nSources of #{us_name} are the same, nothing to compare.")
+              else
+                Dir.chdir(File.join(path, us_name)) do
+                  if us_repo[:git] =~ /(git|https?):\/\/(.+)\/(.+)?\/(.+)/
+                    remote_name = $3
+                    remotes = system_cmd('git remote')
+                    if remotes.include?(remote_name)
+                      puts "Did not have to add remote #{remote_name} to #{us_repo[:name]}, it was already there"
+                    else
+                      puts "Adding remote #{remote_name} #{us_repo[:git]}"
+                      system_cmd("git remote add #{remote_name} #{us_repo[:git]}")
+                    end
+                    system_cmd("git fetch #{remote_name}")
+                    if us_repo[:ref] =~ /^origin\/(\S+)$/
+                      compare_ref = "#{remote_name}/#{$1}"
+                    else
+                      compare_ref = "#{remote_name}/#{us_repo[:ref]}"
+                    end
+
+                    # set up parameters for git log call
+                    ignore_merges = options[:ignore_merges] ? '--no-merges' : ''
+                    show_diffs    = options[:show_diffs]    ? '-u' : ''
+                    oneline       = options[:oneline]       ? '--oneline' : ''
+                    # show the results, this assumes that HEAD is up-to-date (which it should be)
+
+                    if options[:downstream_only] and options[:upstream_only]
+                      abort('Cannot specify both downstream_only and upstream_only')
+                    end
+                    puts "########## Results for #{us_name} ##########"
+                    unless options[:upstream_only]
+                      puts "  ######## Commits only in downstream ########"
+                      results = system_cmd("git log --left-only HEAD...#{compare_ref} #{ignore_merges} #{show_diffs} #{oneline}", true)
+                      puts "  ######## End Downstream results ########"
+                    end
+                    unless options[:downstream_only]
+                      puts "  ######## Commits only in upstream ########"
+                      results = system_cmd("git log --right-only HEAD...#{compare_ref} #{ignore_merges} #{show_diffs} #{oneline}", true)
+                      puts "  ######## End upstream ########"
+                    end
+                    puts "########## End of Results for #{us_name} ##########"
+                  else
+                    abort("Unrecognizable upstream url #{us_repo[:git]}")
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        desc 'generate_puppetfile', 'generates a static version of the Puppetfile'
+        method_option :out_file,
+          :desc => 'output file where static puppetfile should be written to'
+        def generate_puppetfile
+          eval(File.read(File.expand_path(options[:puppetfile])))
+          if options[:out_file]
+            File.open(options[:out_file], 'w') do |fh|
+              print_puppet_file(fh)
+            end
+          else
+            print_puppet_file(STDOUT)
+          end
+        end
+
+        private
+
+          def print_puppet_file(stream)
+            each_module do |repo|
+              repo.delete(:name)
+              out_str = repo.delete(:full_name)
+              repo.each do |k,v|
+                out_str << ", :#{k} => #{v}"
+              end
+              stream.puts(out_str)
+            end
+          end
+
+          # builds out a certain type of repo
+          def build_puppetfile_hash(name, perform_installation=false)
+            repo_hash = {}
+            # set environment variable to determine what version of modules to install
+            # this assumes that the environment variable repos_to_use has been coded in
+            # your Puppetfile to allow installation of different versions of modules
+            ENV['repos_to_use'] = name
+            # parse Puppetfile and install modules in our tmp directory.
+            eval(File.read(File.expand_path(options[:puppetfile])))
+            # install modules if desired
+            install! if perform_installation
+
+            # iterate through all git modules
+            each_module_of_type(:git) do |git_repo|
+              abort("Module git_repo[:name] was defined multiple times in same Puppetfile") if repo_hash[git_repo[:name]]
+              repo_hash[git_repo[:name]] = git_repo
+            end
+            # clear out the modules once finished
+            clear_modules
+            repo_hash
+          end
+
       end
     end
   end

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

@@ -25,19 +25,26 @@ module Librarian
 
             print_verbose "\n##### processing module #{repo[:name]}..."
 
-            case
-            when repo[:git]
-              install_git module_path, repo[:name], repo[:git], repo[:ref]
-            when repo[:tarball]
-              install_tarball module_path, repo[:name], repo[:tarball]
+            module_dir = File.join(module_path, repo[:name])
+
+            unless File.exists?(module_dir)
+              case
+              when repo[:git]
+                install_git module_path, repo[:name], repo[:git], repo[:ref]
+              when repo[:tarball]
+                install_tarball module_path, repo[:name], repo[:tarball]
+              else
+                abort('only the :git and :tarball provider are currently supported')
+              end
             else
-              abort('only the :git and :tarball provider are currently supported')
+              print_verbose "\nModule #{repo[:name]} already installed in #{module_path}"
             end
           end
         end
 
         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)
 

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

@@ -8,22 +8,31 @@ module Librarian
         # evaluate a module and add it our @modules instance variable
         def mod(name, options = {})
           @modules ||= {}
+          full_name   = name
           module_name = name.split('/', 2).last
 
           case
           when options[:git]
             @modules[:git] ||= []
-            @modules[:git].push(options.merge(:name => module_name))
+            @modules[:git].push(options.merge(:name => module_name, :full_name => full_name))
           when options[:tarball]
             @modules[:tarball] ||= []
-            @modules[:tarball].push(options.merge(:name => module_name))
+            @modules[:tarball].push(options.merge(:name => module_name, :full_name => full_name))
           else
             @modules[:forge] ||= []
-            @modules[:forge].push(options.merge(:name => module_name))
+            @modules[:forge].push(options.merge(:name => module_name, :full_name => full_name))
             #abort('only the :git and :tarball providers are currently supported')
           end
         end
 
+        def modules
+          @modules
+        end
+
+        def clear_modules
+          @modules = nil
+        end
+
         # iterate through all modules
         def each_module(&block)
           (@modules || {}).each do |type, repos|

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

@@ -7,6 +7,9 @@ module Librarian
     module Simple
       module Util
 
+        def forge(repo)
+          # this does nothing atm
+        end
         # figure out what directory we are working out og
         def base_dir
           @base_dir ||= Dir.pwd
@@ -26,18 +29,21 @@ module Librarian
         end
 
         # run a command on the system
-        def system_cmd (cmd)
+        def system_cmd (cmd, print_output=false)
           print_verbose "Running cmd: #{cmd}"
           output = `#{cmd}`.split("\n")
-          print_verbose output
+          if print_output
+            puts output
+          else
+            print_verbose output
+          end
           raise(StandardError, "Cmd #{cmd} failed") unless $?.success?
           output
         end
 
-        private
-          def print_verbose(text)
-            puts text if @verbose
-          end
+        def print_verbose(text)
+          puts text if @verbose
+        end
 
       end
     end

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

@@ -1,7 +1,7 @@
 module Librarian
   module Puppet
     module Simple
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/librarian-puppet-simple.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.description = 'Simplify deployment of your Puppet infrastructure by
   automatically pulling in modules from the forge and git repositories with
   a single command.'
-  s.license = 'Apache v2.0'
 
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -23,4 +22,4 @@ Gem::Specification.new do |s|
   s.add_dependency "thor", "~> 0.15"
 
   s.add_development_dependency "rspec", "~> 2.13"
-end
+end

data/spec/functional/clean_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 require 'tmpdir'
 

data/spec/functional/install_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 require 'tmpdir'
 
@@ -51,5 +51,25 @@ describe "Functional - Install" do
       status.should == 0
       output.should include('##### processing module apache')
     end
+
+    describe 'when modules are already installed' do
+      temp_directory = nil
+
+      before :each do
+        temp_directory = Dir.mktmpdir
+        Dir.entries(temp_directory).should =~ ['.', '..']
+        FileUtils.touch File.join(temp_directory, 'apache')
+        Dir.entries(temp_directory).should =~ ['.', '..', 'apache']
+      end
+
+      it 'without clean it should only install ntp' 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')
+        Dir.entries(temp_directory).should =~ ['.', '..', 'apache', 'ntp']
+      end
+
+    end
   end
+
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: librarian-puppet-simple
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dan Bode
@@ -9,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-23 00:00:00 Z
+date: 2013-06-12 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -18,6 +24,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 15
         version: "0.15"
   type: :runtime
   version_requirements: *id001
@@ -28,6 +37,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 13
         version: "2.13"
   type: :development
   version_requirements: *id002
@@ -60,10 +72,9 @@ files:
 - spec/functional/clean_spec.rb
 - spec/functional/install_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/bodepd/librarian-puppet-simple
-licenses: 
-- Apache v2.0
-metadata: {}
+licenses: []
 
 post_install_message: 
 rdoc_options: []
@@ -72,23 +83,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id003 
-    - ">="
+  - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id003
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Bundler for your Puppet modules
 test_files: 
 - spec/fixtures/Puppetfile
 - spec/functional/clean_spec.rb
 - spec/functional/install_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  data.tar.gz: e70ab85f22c10e06549a8e4084512224a7a85de8
-  metadata.gz: cfad763618e6817a981167e95edaf026908b8ea8
-SHA512: 
-  data.tar.gz: 8450ff50735e8083b294e379a9652175688ac9ef27454e00c519d5842d0331131891aad460dc112f02508de7082c57451b2d0e7e61deee4eaed1ee100992c706
-  metadata.gz: 1f1fe4db05d288c0eb566f2e9e39eef07cea6264e312b1b0bff07d084d4855ada399f70429b8d1bdfc3dece7c283ba74c258ff64f6ee907f820027f66847fbfd