falkorlib 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552344c4593779ef9a71c505a6cf36944076085a
-  data.tar.gz: c2b78c907bd0a3793919e86285b8fc05d3329248
+  metadata.gz: d4e94c1089995299cfd1bfaa76cdc3637d5f3f22
+  data.tar.gz: fafd75148f4a2c45e26140f55168d88689fb46f6
 SHA512:
-  metadata.gz: 80190e05c95c7615078dbf48e6fe15a8cefa4b3262d4031e3f9dff71031188a6f5c820d427cf13c2bf77c9ce6c286a1ec1a096d6aa27dc6bbe387c1b9cd15206
-  data.tar.gz: e954e17b3e2f48867d0bb968cdd70c9c8c005dfe1e68203d6b89fe4f94c341a92ab90fc078bb15a2b9812f2fd56f245ce7a8535bd487f7f9e1799aef3f4925b4
+  metadata.gz: 0b71d5459bd221b73367900c5010537cb685f6612dbb3bf6beb0db9ecff39d43bd4f51c4b63dd55512e9accd3ce6ad5e1710aca3b6dac2231d293c0070888574
+  data.tar.gz: 965e09a164c35e08a3a8f70e7b62a319defb69ff0e47532d5bb04ebe65236f2d01db8f73f3c61d84ff19b6cbd48260c69981d9e29581c0e0d29cc2a2a83a92ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.3.9)
+    falkorlib (0.3.10)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
       diffy (>= 3.0)

data/lib/falkorlib/common.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Dim 2014-08-31 22:32 svarrette>
+# Time-stamp: <Ven 2014-09-05 10:44 svarrette>
 ################################################################################
 
 require "falkorlib"
@@ -270,7 +270,12 @@ module FalkorLib #:nodoc:
         # Supported options:
         #   :erb_exclude [array of strings]: pattern(s) to exclude from erb file
         #                                    interpretation and thus to copy 'as is'
-        def init_from_template(templatedir, rootdir, config = {}, options = {})
+        #   :no_interaction [boolean]: do not interact
+        def init_from_template(templatedir, rootdir, config = {}, 
+                               options = {
+	                               :erb_exclude    => [],
+	                               :no_interaction => false
+                               })
             error "Unable to find the template directory" unless File.directory?(templatedir)
             warning "about to initialize/update the directory #{rootdir}"
             really_continue?
@@ -296,34 +301,41 @@ module FalkorLib #:nodoc:
                 # Let's go
                 info "updating '#{relative_outdir.to_s}/#{filename}'"
                 puts "  using ERB template '#{erbfile}'"
-                write_from_erb_template(erbfile, outfile, config)
+                write_from_erb_template(erbfile, outfile, config, options)
             end
         end
 
-        ## ERB generation of the file destfile usung the source template file `erbsrc`
-        def write_from_erb_template(erbfile, outfile, config = {})
+        ## ERB generation of the file `outfile` using the source template file `erbfile`
+        # Supported options:
+        #   :no_interaction [boolean]: do not interact
+        def write_from_erb_template(erbfile, outfile, config = {}, 
+                                    options = {
+                                        :no_interaction => false
+                                    })
             error "Unable to find the template file #{erbfile}" unless File.exists? (erbfile )
             template = File.read("#{erbfile}")
             output   = ERB.new(template, nil, '<>')
-	        content  = output.result(binding)
+            content  = output.result(binding)
             if File.exists?( outfile )
                 ref = File.read( outfile )
-	            return if ref == content
-	            warn "the file '#{outfile}' already exists and will be overwritten."
-	            warn "Expected difference: \n------"
-	            Diffy::Diff.default_format = :color
-	            puts Diffy::Diff.new(ref, content, :context => 1)
+                return if ref == content
+                warn "the file '#{outfile}' already exists and will be overwritten."
+                warn "Expected difference: \n------"
+                Diffy::Diff.default_format = :color
+                puts Diffy::Diff.new(ref, content, :context => 1)
             else
-	            watch =  ask( cyan("  ==> Do you want to see the generated file before commiting the writing (y|N)"), 'No')
-	            puts content if watch =~ /y.*/i
+
+                watch =  options[:no_interaction] ? 'no' : ask( cyan("  ==> Do you want to see the generated file before commiting the writing (y|N)"), 'No')
+                puts content if watch =~ /y.*/i
+
             end
-	        proceed = ask( cyan("  ==> proceed with the writing (Y|n)"), 'Yes')
+            proceed = options[:no_interaction] ? 'yes' : ask( cyan("  ==> proceed with the writing (Y|n)"), 'Yes')
             return if proceed =~ /n.*/i
             info("=> writing #{outfile}")
             File.open("#{outfile}", "w+") do |f|
-		        f.puts content
+                f.puts content
             end
-        end 
+        end
 
 
 

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-09-01 21:46 svarrette>
+# Time-stamp: <Ven 2014-09-05 10:50 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -30,7 +30,7 @@ module FalkorLib  #:nodoc:
                         :source       => '',
                         :project_page => '',
                         :issues_url   => '',
-			            :forge_url    => 'https://forge.puppetlabs.com/',       
+			            :forge_url    => 'https://forge.puppetlabs.com',       
                         :dependencies => [],
                         :operatingsystem_support => [],
                         :tags         => []
@@ -131,7 +131,8 @@ module FalkorLib  #:nodoc:
                 # Bootstrap the directory
                 templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
                 init_from_template(templatedir, moduledir, config, {
-                                       :erb_exclude => [ 'templates\/[^\/]*variables\.erb$' ]
+                                       :erb_exclude    => [ 'templates\/[^\/]*variables\.erb$' ],
+	                                   :no_interaction => true
                                    })
                 # Rename the files / element templatename
                 Dir["#{moduledir}/**/*"].each do |e|
@@ -223,11 +224,15 @@ module FalkorLib  #:nodoc:
                 File.open(jsonfile,"w") do |f|
                     f.write JSON.pretty_generate( metadata )
                 end
+	            run %{ git commit -s -m "Update metadata.json" #{jsonfile} }
                 metadata
             end # parse
 
             ##Upgrade the repository README etc. with the
-            def upgrade(moduledir = Dir.pwd)
+            def upgrade(moduledir = Dir.pwd, 
+                        options = {
+	                        :no_interaction => false
+                        })
                 name     = File.basename( moduledir )
                 error "The module #{name} does not exist" unless File.directory?( moduledir )
                 jsonfile = File.join( moduledir, 'metadata.json')
@@ -245,11 +250,12 @@ module FalkorLib  #:nodoc:
 
                 [ 'README.md', 'doc/contributing.md'].each do |f|
 		            info "Upgrade the content of #{f}"
-		            ans = ask("procceed?", 'Yes')
+		            ans = options[:no_interaction] ? 'Yes' : ask("procceed?", 'Yes')
 		            next unless ans =~ /n*/i 
                     write_from_erb_template(File.join(templatedir, "#{f}.erb"),
                                             File.join(moduledir,  f),
-                                            metadata)
+                                            metadata,
+                                            options)
                 end
             end
 

data/lib/falkorlib/tasks/rspec.rake

@@ -32,7 +32,7 @@ begin
         # Glob pattern to match files.
         #t.pattern = "spec/**/common_*.rb"
         #t.pattern = "spec/**/versioning_*spec.rb"
-        #t.pattern = "spec/**/*puppet*spec.rb"
+        #t.pattern = "spec/**/puppet*spec.rb"
 
         # Whether or not to fail Rake when an error occurs (typically when
         # examples fail).

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, 9  
+	    MAJOR, MINOR, PATCH = 0, 3, 10  
 	    
 	    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: <Lun 2014-09-01 21:51 svarrette>
+# Time-stamp: <Ven 2014-09-05 10:52 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -40,7 +40,7 @@ describe FalkorLib::Puppet::Modules do
 
         it "#init -- create a puppet module" do
             # Prepare answer to the questions
-            Array.new(36).each { |e|  STDIN.should_receive(:gets).and_return('') }
+            Array.new(16).each { |e|  STDIN.should_receive(:gets).and_return('') }
             FalkorLib::Puppet::Modules.init(moduledir)
             templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
             s = true
@@ -52,7 +52,7 @@ describe FalkorLib::Puppet::Modules do
                 filename = File.basename(file)
                 filename = File.basename(file, '.erb') unless file =~ /templates\/toto-variables\.erb/ 
                 f = File.join(moduledir, relative_dir, filename)
-                puts "checking #{f} - #{File.exists?( f )}"
+                #puts "checking #{f} - #{File.exists?( f )}"
                 s &= File.exists?( f )
             end
             s.should be_true
@@ -89,8 +89,9 @@ describe FalkorLib::Puppet::Modules do
         end
 
         it "#upgrade" do
-            Array.new(3).each { |e| STDIN.should_receive(:gets).and_return('') }
-            d = FalkorLib::Puppet::Modules.upgrade(moduledir)
+			d = FalkorLib::Puppet::Modules.upgrade(moduledir, {
+				                                       :no_interaction => true
+			                                       })
         end
 
         it "#parse" do

data/spec/falkorlib/versioning_puppet_module_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # versioning_puppet_module_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Lun 2014-09-01 21:51 svarrette>
+# Time-stamp: <Ven 2014-09-05 10:53 svarrette>
 #
 # @description Check the versioning operations on Gems
 #
@@ -53,7 +53,7 @@ describe FalkorLib::Versioning::Puppet do
 
 
             it "#get_version -- get default version #{default_version} after initialization" do
-                Array.new(36).each { |e|  STDIN.should_receive(:gets).and_return('') }
+                Array.new(16).each { |e|  STDIN.should_receive(:gets).and_return('') }
                 FalkorLib::Puppet::Modules.init(moduledir)
                 v = FalkorLib::Versioning.get_version(moduledir)
                 v.should == default_version

data/templates/puppet/modules/Rakefile

@@ -26,3 +26,6 @@ require 'falkorlib/tasks/puppet'
 ##############################################################################
 #TOP_SRCDIR = File.expand_path(File.join(File.dirname(__FILE__), "."))
 
+require 'rake/clean'
+
+CLEAN.add   'pkg'

data/templates/puppet/modules/metadata.json.erb

@@ -9,6 +9,7 @@
   "source": "<%= config[:source] %>",
   "project_page": "<%= config[:project_page] %>",
   "issues_url": "<%= config[:issues_url] %>",
+  "forge_url": "<%= config[:forge_url] %>",
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake