falkorlib 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39932a4c7312da0130e12bd7d2e3f0263e1314d7
-  data.tar.gz: 0de959dd8614849eb537293e154c143a7a173c2a
+  metadata.gz: 395609cb7eea10171f370b653926e3f45d1ec4fb
+  data.tar.gz: 4c1be259201f3f86178f6538930d2c62cbc727bf
 SHA512:
-  metadata.gz: 7e13d023f008ae000f8c3aad8c0c67deeed9e778a7a2c19b2ad1801c860a259acb407583e6161f9cf8ff9bbc5e46bbeb68ce2b20b29228c5ab587442781117bf
-  data.tar.gz: 3d23d36238a9ad43d8e08ad611558c331b06496e9910e97cc856682657b5bfdb91da115f9fd84eaa7ed1bc7a4a1288472a7bb8187c188d685e80710996924301
+  metadata.gz: c373d7743ad2a45ec4a5f452d25ae24dc10476c12a879b3c8b8133287f1e4f22672c646aec4a40e77de138d588fcb102450b12d63c065ca434da55f14442e684
+  data.tar.gz: 43e3a90e07c2dac1298a096be8c1ea27fc450d2fcd0b130e64b642660ced449348c50b54a67d8ea8f52f820b813baf27a31f7f322daa4c713fe34ecf62c8e599

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.3.1)
+    falkorlib (0.3.2)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
       git_remote_branch (~> 0)

data/lib/falkorlib/common.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-08-25 23:43 svarrette>
+# Time-stamp: <Thu 2014-08-28 23:12 svarrette>
 ################################################################################
 
 require "falkorlib"
@@ -171,11 +171,12 @@ module FalkorLib #:nodoc:
         #   :only_files      [boolean]: list only files in the glob
         #   :only_dirs       [boolean]: list only directories in the glob
         #   :pattern_include [array of strings]: pattern(s) to include for listing   
-        #   :pattern_exclude [array of strings]: pattern(s) to exclude for listing   
+        #   :pattern_exclude [array of strings]: pattern(s) to exclude for listing
+        #   :text            [string]: text to put
         def list_items(glob_pattern, options = {})
             list  = { 0 => 'Exit' }
             index = 1
-            raw_list = { }
+            raw_list = { 0 => 'Exit' }
 
             Dir["#{glob_pattern}"].each do |elem|
                 #puts "=> element '#{elem}' - dir = #{File.directory?(elem)}; file = #{File.file?(elem)}"
@@ -206,6 +207,8 @@ module FalkorLib #:nodoc:
             text        = options[:text].nil?    ? "select the index" : options[:text]
             default_idx = options[:default].nil? ? 0 : options[:default]
             raise SystemExit.new('Empty list') if index == 1
+	        #ap list
+	        #ap raw_list
             # puts list.to_yaml
             # answer = ask("=> #{text}", "#{default_idx}")
             # raise SystemExit.new('exiting selection') if answer == '0'

data/lib/falkorlib/config.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-08-25 22:29 svarrette>
+# Time-stamp: <Fri 2014-08-29 14:06 svarrette>
 ################################################################################
 # FalkorLib Configuration
 #
@@ -45,6 +45,9 @@ module FalkorLib #:nodoc:
 		    :custom_cfg => '.falkorlib.yaml',
 		    :rvm => {
 			    :rubies => [ '1.9.3', '2.0.0', '2.1.0']
+		    },
+		    :templates => {
+			    :puppet => {}
 		    }
         }
 
@@ -58,7 +61,10 @@ module FalkorLib #:nodoc:
                 res[:git]        = FalkorLib::Config::Git::DEFAULTS        if path.include?('lib/falkorlib/git.rb')
                 res[:gitflow]    = FalkorLib::Config::GitFlow::DEFAULTS    if path.include?('lib/falkorlib/git.rb')
 		        res[:versioning] = FalkorLib::Config::Versioning::DEFAULTS if path.include?('lib/falkorlib/versioning.rb')
-		        res[:puppet]     = FalkorLib::Config::Puppet::DEFAULTS     if path.include?('lib/falkorlib/puppet.rb')
+		        if path.include?('lib/falkorlib/puppet.rb')
+			        res[:puppet]     = FalkorLib::Config::Puppet::DEFAULTS     
+			        res[:templates][:puppet][:modules] = FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata]
+		        end 
             end
 	        # Check the potential local customizations
 	        custom_cfg = File.join( res[:root], res[:custom_cfg])

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2014-08-26 14:17 svarrette>
+# Time-stamp: <Thu 2014-08-28 23:02 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -9,6 +9,7 @@ require "falkorlib"
 require "falkorlib/common"
 
 require "pathname"
+require 'json'
 
 include FalkorLib::Common
 
@@ -51,18 +52,46 @@ module FalkorLib  #:nodoc:
     module Puppet
         # Management of Puppet Modules operations
         module Modules
-            module_function
 
-            ## Initialize a new Puppet Module named `name` in `rootdir`.
-            # Supported options: 
+	        module_function
+	                    
+            def _get_classdefs(moduledir = Dir.pwd, type = 'classes')
+	            name     = File.basename( moduledir )
+	            error "The module #{name} does not exist" unless File.directory?( moduledir )
+	            t = case type
+	                when /class*/i 
+		                'class'
+	                when /def*/    
+		                'define'
+	                else 
+		                ''		            
+	            end
+	            error "Undefined type #{type}" if t.empty?	            
+                result = []
+                Dir["#{moduledir}/manifests/**/*.pp"].each do |ppfile|
+		            File.read(ppfile).scan(/^[ \t]*#{t}[\s]+([0-9a-zA-z:]+).*$/).each do |line|
+                        result << line[0]
+                    end
+                end
+                result.uniq!
+                result
+            end
+
+
+
+            ####
+            # Initialize a new Puppet Module named `name` in `rootdir`.
+            # Supported options:
             # * :no_iteraction [boolean]
+            ##
             def init(rootdir = Dir.pwd, name = '', options = {})
                 config = {}
-	            login = `whoami`.chomp
-	            config[:name] = name unless name.empty?
-	            FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata].each do |k,v|
+                login = `whoami`.chomp
+                config[:name] = name unless name.empty?
+	            moduledir = name.empty? ? rootdir : File.join(rootdir, name)
+                FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata].each do |k,v|
                     next if v.kind_of?(Array) or k == :license
-		            next if k == :name and ! name.empty?
+                    next if k == :name and ! name.empty?
                     default_answer = case k
                                      when :project_page
                                          config[:source].nil? ? v : config[:source]
@@ -71,60 +100,150 @@ module FalkorLib  #:nodoc:
                                      when :issue_url
                                          config[:project_page].nil? ? v : "#{config[:project_page]}/issues"
                                      when :description
-	                                     config[:summary].nil? ? v : "#{config[:summary]}"
+                                         config[:summary].nil? ? v : "#{config[:summary]}"
                                      when :source
-	                                     v.empty? ? "https://github.com/#{`whoami`.chomp}/#{config[:name]}" : v
+                                         v.empty? ? "https://github.com/#{`whoami`.chomp}/#{config[:name]}" : v
                                      else
                                          v
                                      end
                     config[k.to_sym] = ask( "\t" + sprintf("%-20s", "Module #{k}"), default_answer)
                 end
-	            name = config[:name].gsub(/.*-/, '')
-                tags = ask("\tKeywords (comma-separated list of tags)", name)
-	            config[:tags] = tags.split(',')
-	            license = select_from(FalkorLib::Config::Puppet::Modules::DEFAULTS[:licenses], 
-	                                  'Select the license index for the Puppet module:', 
-	                                  1)
-	            config[:license] = license.downcase unless license.empty?
-	            puts "\t" + sprintf("%-20s", "Module License:") + config[:license]
-	            
-	            #ap config
-	            # Bootstrap the directory
-	            templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
-	            init_from_template(templatedir, rootdir, config, {
-		                               :erb_exclude => [ 'templates\/[^\/]*\.erb$' ]
-	                               })
-	            # Rename the files / element templatename
-	            Dir["#{rootdir}/**/*"].each do |e| 
-		            next unless e =~ /templatename/
-		            info "renaming #{e}"
-		            newname = e.gsub(/templatename/, "#{name}")
-		            run %{ mv #{e} #{newname} }
-	            end
+                name = config[:name].gsub(/.*-/, '')
+	            tags = ask("\tKeywords (comma-separated list of tags)", name)
+                config[:tags] = tags.split(',')
+                license = select_from(FalkorLib::Config::Puppet::Modules::DEFAULTS[:licenses],
+                                      'Select the license index for the Puppet module:',
+                                      1)
+                config[:license] = license.downcase unless license.empty?
+                puts "\t" + sprintf("%-20s", "Module License:") + config[:license]
 
-	            info "Generating the License file"
-	            Dir.chdir(rootdir) do 
-		            run %{licgen #{config[:license]} #{config[:author]}}
-	            end
-	            info "Initialize RVM"
-	            init_rvm(rootdir)
-	            unless FalkorLib::GitFlow.init?(rootdir)
-		            warn "Git [Flow] is not initialized in #{rootdir}."
-		            a = ask("Proceed to git-flow initialization (Y|n)", 'Yes')
-		            FalkorLib::GitFlow.init(rootdir) unless a =~ /n.*/i
-	            end 
-
-	            # Propose to commit the key files
-	            if FalkorLib::Git.init?(rootdir)
-		            if FalkorLib::GitFlow.init?(rootdir)
-			            info "=> preparing git-flow feature for the newly created module '#{config[:name]}'"
-			            FalkorLib::GitFlow.start('feature', "init_#{name}", rootdir)
+                #ap config
+                # Bootstrap the directory
+                templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
+	            init_from_template(templatedir, moduledir, config, {
+                                       :erb_exclude => [ 'templates\/[^\/]*\.erb$' ]
+                                   })
+                # Rename the files / element templatename
+                Dir["#{moduledir}/**/*"].each do |e|
+                    next unless e =~ /templatename/
+                    info "renaming #{e}"
+                    newname = e.gsub(/templatename/, "#{name}")
+                    run %{ mv #{e} #{newname} }
+                end
+
+                info "Generating the License file"
+                authors = config[:author].empty? ? 'UNKNOWN' : config[:author]
+                Dir.chdir(moduledir) do
+                    run %{ licgen #{config[:license]} #{authors} }
+                end
+                info "Initialize RVM"
+                init_rvm(moduledir)
+                unless FalkorLib::GitFlow.init?(moduledir)
+                    warn "Git [Flow] is not initialized in #{moduledir}."
+                    a = ask("Proceed to git-flow initialization (Y|n)", 'Yes')
+                    FalkorLib::GitFlow.init(moduledir) unless a =~ /n.*/i
+                end
+
+                # Propose to commit the key files
+                if FalkorLib::Git.init?(moduledir)
+                    if FalkorLib::GitFlow.init?(moduledir)
+                        info "=> preparing git-flow feature for the newly created module '#{config[:name]}'"
+                        FalkorLib::GitFlow.start('feature', "init_#{name}", moduledir)
+                    end
+                    [ 'metadata.json', 'LICENSE', '.gitignore', 'Gemfile', 'Rakefile'].each do |f|
+                        FalkorLib::Git.add(File.join(moduledir, f))
+                    end
+                end
+            end # init
+
+            ####
+            # Parse a given modules to collect information
+            ##
+            def parse(moduledir = Dir.pwd)
+                name     = File.basename( moduledir )
+                error "The module #{name} does not exist" unless File.directory?( moduledir )
+	            jsonfile = File.join( moduledir, 'metadata.json')
+	            error "Unable to find #{jsonfile}" unless File.exist?( jsonfile ) 
+	            metadata = JSON.parse( IO.read( jsonfile ) )
+	            metadata["classes"]     = classes(moduledir)
+	            metadata["definitions"] = definitions(moduledir)
+	            deps        = deps(moduledir)
+	            listed_deps = metadata["dependencies"]
+	            missed_deps = []
+	            metadata["dependencies"].each do |dep|
+		            lib = dep["name"].gsub(/^[^\/-]+[\/-]/,'')
+		            if deps.include?( lib )
+			            deps.delete( lib ) 
+		            else 
+			            unless lib =~ /stdlib/
+				            warn "The library '#{dep["name"]}' is not analyzed as part of the #{name} module" 
+				            missed_deps << dep
+			            end 
 		            end 
-		            [ 'metadata.json', 'LICENSE', '.gitignore', 'Gemfile', 'Rakefile'].each do |f| 
-			            FalkorLib::Git.add(File.join(rootdir, f))
+	            end
+	            if ! deps.empty?
+		            deps.each do |l| 
+			            warn "The module '#{l}' is missing in the dependencies thus added"
+			            login = ask("[Github] login for the module '#{lib}'")
+			            version = ask("Version requirement (ex: '>=1.0.0 <2.0.0' or '1.2.3' or '1.x')")
+			            metadata["dependencies"] << {
+				            "name"                => "#{login}/#{lib}",
+				            "version_requirement" => "#{version}"
+			            }
 		            end
-	            end 
-            end # init
+		            warn "About to commit these changes in the '#{name}/metadata.json' file"
+		            really_continue?
+		            File.open(jsonfile,"w") do |f|
+			            f.write JSON.pretty_generate( metadata )
+		            end
+	            end
+            end # parse
+
+
+            #######
+            # Find the classes of a given module
+            ###
+            def classes(moduledir = Dir.pwd)
+	            _get_classdefs(moduledir, 'classes')
+            end
+
+            #######
+            # Find the definitions of a given module
+            ###
+            def definitions(moduledir = Dir.pwd)
+	            _get_classdefs(moduledir, 'definitions')
+            end
+
+            #######
+            # Find the dependencies of a given module
+            ###
+            def deps(moduledir = Dir.pwd)
+	            name     = File.basename( moduledir )
+	            error "The module #{name} does not exist" unless File.directory?( moduledir )
+
+	            result    = Array.new
+	            result2   = Array.new
+	            resulttmp = Array.new
+
+	            result << name
+
+	            while result != result2 do
+		            resulttmp = result.dup
+		            (result - result2).each do |x|
+			            Dir["#{moduledir}/**/*.pp"].each do |ppfile|
+				            File.read(ppfile).scan(/^[ \t]*include.*$|^[ \t]*require.*$/).each do |line|
+					            if line.scan(">").length == 0
+						            result << line.gsub(/^[ \t]*(include|require) ([\"']|)([0-9a-zA-Z:{$}\-]*)([\"']|)/, '\3').split("::").first
+					            end
+				            end
+			            end
+		            end
+		            result.uniq!
+		            result2 = resulttmp.dup
+	            end
+	            result.delete "#{name}"
+	            result
+            end
 
 
         end # module FalkorLib::Puppet::Modules

data/lib/falkorlib/tasks/puppet_modules.rake

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
 # puppet_modules.rake - Special tasks for the management of Puppet modules
-# Time-stamp: <Lun 2014-08-25 22:54 svarrette>
+# Time-stamp: <Thu 2014-08-28 23:04 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -26,10 +26,18 @@ namespace :bootstrap do
 			moduledir = File.join( FalkorLib.config[:puppet][:modulesdir], name)
 			dir = ask("Destination directory:", moduledir)
 			error "The module '#{name}' already exists" if File.directory?(dir)
-			FalkorLib::Puppet::Modules.init(dir, name)
+			FalkorLib::Puppet::Modules.init(dir)
 		end 
 
 
 	end # namespace bootstrap:puppet
 end # namespace bootstrap
 
+
+
+#.....................
+namespace :puppet do
+	include FalkorLib::Common
+
+
+end # namespace puppet

data/lib/falkorlib/version.rb

@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
         # MAJOR: Defines the major version
         # MINOR: Defines the minor version
         # PATCH: Defines the patch version
-	    MAJOR, MINOR, PATCH = 0, 3, 1  
+	    MAJOR, MINOR, PATCH = 0, 3, 2  
 	    
 	    module_function
 	    

data/spec/falkorlib/puppet_modules_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # puppet_modules_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Mar 2014-08-26 15:04 svarrette>
+# Time-stamp: <Fri 2014-08-29 11:32 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -19,6 +19,10 @@ describe FalkorLib::Puppet::Modules do
 
     dir   = Dir.mktmpdir
     #afile = File.join(dir, 'a_file')
+	# before :all do
+	# 	ENV['GIT_AUTHOR_NAME']  = 'travis'            if ENV['GIT_AUTHOR_NAME'].nil?
+	# 	ENV['GIT_AUTHOR_EMAIL'] = 'travis@domain.org' if ENV['GIT_AUTHOR_EMAIL'].nil?
+	# end
 
     after :all do
         FileUtils.remove_entry_secure dir
@@ -27,10 +31,14 @@ describe FalkorLib::Puppet::Modules do
     #############################################################
     context "Test Puppet Module creation within temporary directory " do
 
+		# Module name
+		name      = 'toto'
+		moduledir = File.join(dir, name) 
+
         it "#init -- create a puppet module" do
-			Array.new(18).each { |e|  STDIN.should_receive(:gets).and_return('') }
-            name = 'toto'
-            FalkorLib::Puppet::Modules.init(dir, name)
+			Array.new(26).each { |e|  STDIN.should_receive(:gets).and_return('') }
+			STDIN.should_receive(:gets).and_return('No')
+            FalkorLib::Puppet::Modules.init(moduledir)
             templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
             s = true
             Dir["#{templatedir}/**/*"].each  do |e|
@@ -39,13 +47,41 @@ describe FalkorLib::Puppet::Modules do
 				file = e.gsub(/templatename/, "#{name}")
 				filename = File.basename(file)
 				filename = File.basename(file, '.erb') unless file =~ /templates\/toto-variables\.erb/
-				f = File.join(dir, relative_dir, filename)
+				f = File.join(moduledir, relative_dir, filename)
 				#puts "checking #{f} - #{File.exists?( f )}"
                 s &= File.exists?( f )
             end
             s.should be_true
         end
 
+		it "#classes -- list classes" do
+			l = FalkorLib::Puppet::Modules._get_classdefs(moduledir, 'classes')
+			c = FalkorLib::Puppet::Modules.classes(moduledir)
+			c.should == l
+			ref =  [
+			        "toto::params",
+			        "toto",
+			        "toto::common",
+			        "toto::debian",
+			        "toto::redhat"
+			       ]
+			c.size.should == ref.size
+			c.each { |e| ref.should include(e) }
+		end
+		
+		it "#definitions -- list definitions" do
+			d = FalkorLib::Puppet::Modules.definitions(moduledir)
+			d.should == [ "toto::mydef" ]
+		end
+
+		it "#deps -- list dependencies" do
+			d = FalkorLib::Puppet::Modules.deps(moduledir)
+			d.should == []
+		end
+
+
+
+
 
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake