falkorlib 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3016d72370c962b095a38b6c661376d8c5937f4
-  data.tar.gz: f7085f04b36a1da05630dedafd8ab66c51db9bc9
+  metadata.gz: ac83da0f27d90c212ef11d4eb49797531aa5e182
+  data.tar.gz: f26283dc8a2b3d61a2d5634875d7b5c8e837d594
 SHA512:
-  metadata.gz: 81b1c0874548dfe44c7a2f7a9485ccdf95b4d1e1b978d024570494c6a6a330f9ad3f3f749b480f7297778219465f39f401fbb6f19f7cbb151f2d2a337e2cfb13
-  data.tar.gz: 3ee861b38638d8138b190e4f2debc5949c0b918de6a6c10445f81a0b6dfe33dfd2ace0324bd8de2e43ca1a1b262bd5b818905917280ae54d01e8fa17a3d05937
+  metadata.gz: c594d1cc7ae26b01db0869fe26c8f2e6a4e297192f7f2228175a795e1dbeeed5ca84b083658d1a62883b13e14f2c45225ac24ceecad7149f9fff0479366e0d12
+  data.tar.gz: 405cf89860590016e86e3529db29762d78a089a111c0ebecd100ca331cdb582d57e9b626f5b2de552b3c06f5b074a26cd17dee4fc674a41b6086dc695e21e824

data/Gemfile.lock

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

data/lib/falkorlib/common.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sat 2014-08-30 21:05 svarrette>
+# Time-stamp: <Dim 2014-08-31 22:32 svarrette>
 ################################################################################
 
 require "falkorlib"
@@ -183,14 +183,14 @@ module FalkorLib #:nodoc:
                 next if (! options[:only_files].nil?) && options[:only_files] && File.directory?(elem)
                 next if (! options[:only_dirs].nil?)  && options[:only_dirs]  && File.file?(elem)
                 entry = File.basename(elem)
-                unless options[:pattern_include].nil?
-                    select_entry = false
-                    options[:pattern_include].each do |pattern|
-                        #puts "considering pattern '#{pattern}' on entry '#{entry}'"
-                        select_entry |= entry =~ /#{pattern}/
-                    end
-                    next unless select_entry
-                end
+                # unless options[:pattern_include].nil?
+                #     select_entry = false
+                #     options[:pattern_include].each do |pattern|
+                #         #puts "considering pattern '#{pattern}' on entry '#{entry}'"
+                #         select_entry |= entry =~ /#{pattern}/
+                #     end
+                #     next unless select_entry
+                # end
                 unless options[:pattern_exclude].nil?
                     select_entry = false
                     options[:pattern_exclude].each do |pattern|

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sat 2014-08-30 22:00 svarrette>
+# Time-stamp: <Sun 2014-08-31 16:24 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -148,13 +148,14 @@ module FalkorLib  #:nodoc:
                 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)", 'No')
-	                return if a =~ /n.*/i
-                    FalkorLib::GitFlow.init(moduledir) 
-                end
-
+	            unless FalkorLib::Git.init?(moduledir)
+		            init_gitflow = command?('git-flow')
+		            warn "Git #{init_gitflow ? '[Flow]' : ''} is not initialized in #{moduledir}."
+		            a = ask("Proceed to git-flow initialization (Y|n)", 'Yes')
+		            return if a =~ /n.*/i
+		            init_gitflow ? FalkorLib::GitFlow.init(moduledir) : FalkorLib::Git.init(moduledir)
+	            end 
+               
                 # Propose to commit the key files
                 if FalkorLib::Git.init?(moduledir)
                     if FalkorLib::GitFlow.init?(moduledir)
@@ -212,7 +213,7 @@ module FalkorLib  #:nodoc:
                 puts content
 	            if ref == content
 		            warn "No difference to commit"
-		            return 
+		            return []
 	            end 
 	            info "Differences with the previous file"
 	            Diffy::Diff.default_format = :color

data/lib/falkorlib/tasks/gem.rake

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
 # gem.rake - Special tasks for the management of Gem operations
-# Time-stamp: <Ven 2014-06-20 15:00 svarrette>
+# Time-stamp: <Dim 2014-08-31 22:59 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -75,6 +75,16 @@ Rake::Task['build'].enhance do
     Rake::Task["sign"].invoke if File.directory?(File.join(ENV['HOME'], '.gnupg') )
 end
 
+[ 'major', 'minor', 'patch' ].each do |level|
+	Rake::Task["version:bump:#{level}"].enhance do 
+		warn "about to run the rspec tests to ensure the release can be done"
+		really_continue?
+		Rake::Task['rspec'].invoke
+	end
+end 
+
+
+
 # Gem::Tasks.new(
 #                :console => false,
 #                :install => false,

data/lib/falkorlib/tasks/rspec.rake

@@ -30,9 +30,9 @@ begin
   desc "Run RSpec code examples '*_spec.rb' from the spec/ directory"
   RSpec::Core::RakeTask.new(:rspec) do |t|
     # Glob pattern to match files.
-    #t.pattern = "spec/**/test_*.rb"
-	#t.pattern = "spec/**/*_spec.rb"
-		#t.pattern = "spec/**/puppet*spec.rb"
+		#t.pattern = "spec/**/common_*.rb"
+	#t.pattern = "spec/**/versioning_*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, 7  
+	    MAJOR, MINOR, PATCH = 0, 3, 8  
 	    
 	    module_function
 	    

data/lib/falkorlib/versioning.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sam 2014-08-23 12:32 svarrette>
+# Time-stamp: <Dim 2014-08-31 22:00 svarrette>
 ################################################################################
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #
@@ -72,7 +72,7 @@ module FalkorLib #:nodoc:
             version = FalkorLib.config[:versioning][:default]
             type    = FalkorLib.config[:versioning][:type]
             source  = FalkorLib.config[:versioning][:source][ type ]
-            case type
+	        case type
             when 'file'
                 versionfile = File.join( rootdir, source[:filename] )
                 version = File.read( versionfile ).chomp if File.exist? ( versionfile )
@@ -170,6 +170,14 @@ module FalkorLib #:nodoc:
             end
             version = [major, minor, patch].compact.join('.')
         end
-    end
+
+        # for rspec
+        module Gem
+        end
+        # for rspec
+        module Puppet
+        end
+
+    end # module
 
 end

data/spec/falkorlib/common_spec.rb

@@ -5,6 +5,19 @@ describe FalkorLib::Common do
 
     include FalkorLib::Common
 
+	dir   = Dir.mktmpdir
+
+	before :all do
+		FileUtils.touch File.join(dir, 'file1.txt')
+		FileUtils.touch File.join(dir, 'file2.txt')
+		FileUtils.mkdir File.join(dir, 'dir1')
+		FileUtils.mkdir File.join(dir, 'dir2')
+	end 
+
+    after :all do
+        FileUtils.remove_entry_secure dir
+    end
+
 	#############################################
     context "Test (common) printing functions" do
 
@@ -162,8 +175,6 @@ describe FalkorLib::Common do
 	end
 
 
-
-
 	#############################################
     context "Test (common) YAML functions" do
 
@@ -184,4 +195,43 @@ describe FalkorLib::Common do
 
 	end 
 
+	############################################
+	context 'Test list selection functions' do
+		
+		it "#list_items - Exit on 0" do
+			STDIN.should_receive(:gets).and_return('0')
+			expect { list_items("#{dir}/*") }.to raise_error (SystemExit)
+		end
+
+		it "#list_items -- select files only" do
+			STDIN.should_receive(:gets).and_return('1')
+			f = list_items("#{dir}/*", { :only_files => true })
+			f.should =~ /\/file.?\.txt$/
+		end
+
+		it "#list_items -- select files only with pattern exclude" do
+			STDIN.should_receive(:gets).and_return('1')
+			f = list_items("#{dir}/*", { :only_files => true, :pattern_exclude => [ 'file1' ] })
+			f.should == "#{dir}/file2.txt"
+		end
+
+		it "#list_items -- select dirs only" do
+			STDIN.should_receive(:gets).and_return('1')
+			f = list_items("#{dir}/*", { :only_dirs => true })
+			f.should =~ /\/dir.?$/
+		end
+
+		it "#list_items -- select dirs only with pattern exclude" do
+			STDIN.should_receive(:gets).and_return('1')
+			f = list_items("#{dir}/*", { :only_dirs => true, :pattern_exclude => [ 'dir1' ] })
+			f.should == "#{dir}/dir2"
+		end
+
+		it "#list_items -- exit on empty list" do
+			#STDIN.should_receive(:gets).and_return('1')
+			expect { list_items("#{dir}/*", { :only_files => true, :pattern_exclude => [ '.*\.txt']}) }.to raise_error (SystemExit)
+		end
+	end
+
+
 end

data/spec/falkorlib/puppet_modules_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # puppet_modules_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sat 2014-08-30 22:18 svarrette>
+# Time-stamp: <Dim 2014-08-31 22:45 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -19,6 +19,11 @@ describe FalkorLib::Puppet::Modules do
     include FalkorLib::Common
 
     dir   = Dir.mktmpdir
+	# Module name
+	name      = 'toto'
+	moduledir = File.join(dir, name)
+	jsonfile = File.join( moduledir, 'metadata.json') 
+
     #afile = File.join(dir, 'a_file')
     # before :all do
     #   ENV['GIT_AUTHOR_NAME']  = 'travis'            if ENV['GIT_AUTHOR_NAME'].nil?
@@ -32,14 +37,10 @@ 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
             # Prepare answer to the questions
             Array.new(32).each { |e|  STDIN.should_receive(:gets).and_return('') }
-
             FalkorLib::Puppet::Modules.init(moduledir)
             templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
             s = true
@@ -56,6 +57,11 @@ describe FalkorLib::Puppet::Modules do
             s.should be_true
         end
 
+		it "#_getclassdefs -- should failed on unrecogized type" do
+			expect { FalkorLib::Puppet::Modules._get_classdefs(dir, 'toto') }.to raise_error (SystemExit)
+		end
+
+
         it "#classes -- list classes" do
             l = FalkorLib::Puppet::Modules._get_classdefs(moduledir, 'classes')
             c = FalkorLib::Puppet::Modules.classes(moduledir)
@@ -88,26 +94,47 @@ describe FalkorLib::Puppet::Modules do
 
         it "#parse" do
             STDIN.should_receive(:gets).and_return('')
-            jsonfile = File.join( moduledir, 'metadata.json')
             ref = JSON.parse( IO.read( jsonfile ) )
             metadata = FalkorLib::Puppet::Modules.parse(moduledir)
-            diff = (metadata.to_a - ref.to_a).flatten
+            diff = (metadata.to_a - ref.to_a).flatten.sort
             diff.should == [
                             'classes',
-                            'toto::params',
+                            'definitions',
                             'toto',
                             'toto::common',
                             'toto::debian',
-                            'toto::redhat',
-                            'definitions',
                             'toto::mydef',
+                            'toto::params',
+                            'toto::redhat',
                            ]
-
-
         end
 
+		it "#parse again" do
+			metadata = FalkorLib::Puppet::Modules.parse(moduledir)
+			metadata.should == []
+		end
+
+		it "#deps -- should find a new dependency" do
+			classfile = File.join(moduledir, 'manifests', 'classes', 'toto.pp')
+			newdep = "tata"
+			run %{ echo 'include "#{newdep}"' >> #{classfile} }
+			a = FalkorLib::Puppet::Modules.deps(moduledir)
+			a.should include newdep 
+		end
+
+		it "#parse -- should ask new dependency elements" do
+			ref      = JSON.parse( IO.read( jsonfile ) )
+			STDIN.should_receive(:gets).and_return('svarrette')
+			STDIN.should_receive(:gets).and_return('1.2')
+			STDIN.should_receive(:gets).and_return('Yes')
+			metadata = FalkorLib::Puppet::Modules.parse(moduledir)
+			diff = (metadata.to_a - ref.to_a).flatten
+			diff.should == [
+			                'dependencies',
+			                {"name"=>"puppetlabs-stdlib", "version_range"=>">= 1.0.0"}, 
+			                {"name"=>"svarrette/tata", "version_requirement"=>"1.2"}
+			               ]
+		end
+    end # context
 
-
-
-    end
 end

data/spec/falkorlib/versioning_gem_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # versioning_gem_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Mar 2014-07-01 17:29 svarrette>
+# Time-stamp: <Dim 2014-08-31 22:34 svarrette>
 #
 # @description Check the versioning operations on Gems
 #
@@ -14,7 +14,7 @@ require 'spec_helper'
 require 'tmpdir'
 
 
-describe FalkorLib::Versioning do
+describe FalkorLib::Versioning::Gem do
 
     include FalkorLib::Common
 
@@ -30,25 +30,38 @@ describe FalkorLib::Versioning do
         :major   => '5.0.0'
     }
 
-    after :all do
-        FileUtils.remove_entry_secure dir
-		configatron.temp do
-			FalkorLib.config.versioning[:type] = 'file'
-		end 
-    end
-
-    configatron.temp do
-        FalkorLib.config.versioning do |c|
+	before :all do
+		configatron.temp_start
+		FalkorLib.config.versioning do |c|
             c[:type] = 'gem'
             c[:source]['gem'][:filename]  = "#{versionfile}"
             c[:source]['gem'][:getmethod] = "::TestGemVersion.version"
         end
+	end 
+
+    after :all do
+        configatron.temp_end
+		FileUtils.remove_entry_secure dir
+		FalkorLib.config[:versioning][:type] = 'file' 
+        # configatron.temp do
+        #     FalkorLib.config.versioning[:type] = 'file'
+        # end
+    end
+
+    # configatron.temp do
+    #     FalkorLib.config.versioning do |c|
+    #         c[:type] = 'gem'
+    #         c[:source]['gem'][:filename]  = "#{versionfile}"
+    #         c[:source]['gem'][:getmethod] = "::TestGemVersion.version"
+    #     end
 
 
         ###################################################################
         context 'Test GEM versioning operations within temporary directory' do
+
+
             it "#get_version -- NameError on non-existing method" do
-				if command?('git_flow')
+                if command?('git_flow')
                     STDIN.should_receive(:gets).and_return('Yes')
                     t = FalkorLib::GitFlow.init(dir)
                     t.should == 0
@@ -130,6 +143,6 @@ describe FalkorLib::Versioning do
             end
         end
 
-    end #configatron.temp
+    #end #configatron.temp
 
 end # describe FalkorLib::Versioning

data/spec/falkorlib/versioning_puppet_module_spec.rb

@@ -0,0 +1,111 @@
+#!/usr/bin/ruby
+#########################################
+# versioning_puppet_module_spec.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Dim 2014-08-31 22:00 svarrette>
+#
+# @description Check the versioning operations on Gems
+#
+# Copyright (c) 2013 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'spec_helper'
+require 'tmpdir'
+
+
+describe FalkorLib::Versioning::Puppet do
+
+    include FalkorLib::Common
+
+    dir   = Dir.mktmpdir
+    name      = 'toto'
+    moduledir = File.join(dir, name)
+    default_version  = FalkorLib.config[:versioning][:default]
+
+    workingversion = {
+        :default => '4.5.6',
+        :patch   => '4.5.7',
+        :minor   => '4.6.0',
+        :major   => '5.0.0'
+    }
+
+	before :all do
+		configatron.temp_start
+		FalkorLib.config.versioning do |c|
+			c[:type] = 'puppet_module'
+		end
+	end 
+
+    after :all do
+		configatron.temp_end
+        FileUtils.remove_entry_secure dir
+		FalkorLib.config.versioning[:type] = 'file'
+    end
+
+    # configatron.temp do
+    #     FalkorLib.config.versioning do |c|
+    #         c[:type] = 'puppet_module'
+    #     end
+
+        ###################################################################
+        context 'Test Puppet Module versioning operations within temporary directory' do
+
+
+            it "#get_version -- get default version #{default_version} after initialization" do
+                Array.new(32).each { |e|  STDIN.should_receive(:gets).and_return('') }
+                FalkorLib::Puppet::Modules.init(moduledir)
+                v = FalkorLib::Versioning.get_version(moduledir)
+                v.should == default_version
+                if command?('git-flow')
+                    a = FalkorLib::GitFlow.finish('feature', 'bootstraping', moduledir)
+                    a.should == 0
+                end
+            end
+
+            it "#set_version -- should set the '#{workingversion[:default]}' version" do
+                STDIN.should_receive(:gets).and_return('Yes')
+                v = FalkorLib::Versioning.set_version(workingversion[:default], moduledir)
+                v.should == 0
+            end
+
+            it "#get_version -- should get the '#{workingversion[:default]}'" do
+                v = FalkorLib::Versioning.get_version(moduledir)
+                v.should == workingversion[:default]
+            end
+
+            it "#major -- should collect the major version" do
+                v = FalkorLib::Versioning.get_version(moduledir)
+                m = FalkorLib::Versioning.major(v)
+                m.should == '4'
+            end
+            it "#minor -- should collect the minor version" do
+                v = FalkorLib::Versioning.get_version(moduledir)
+                m = FalkorLib::Versioning.minor(v)
+                m.should == '5'
+            end
+            it "#patch -- should collect the patch version" do
+                v = FalkorLib::Versioning.get_version(moduledir)
+                m = FalkorLib::Versioning.patch(v)
+                m.should == '6'
+            end
+
+            #FalkorLib.config[:versioning][:levels].reverse.each do |level|
+            ['patch', 'minor'].each do |level|
+                it "#set_version #bump -- #{level} bump version number from #{workingversion[:default]} to #{workingversion[level.to_sym]}" do
+                    v = FalkorLib::Versioning.get_version(moduledir)
+                    v.should == workingversion[:default]
+                    v2 = FalkorLib::Versioning.bump(v, level.to_sym)
+                    v2.should == workingversion[level.to_sym]
+                    #STDIN.should_receive(:gets).and_return('Yes')
+                    #d = FalkorLib::Versioning.set_version(v2, moduledir)
+                    #d.should == 0
+                    #v3 = FalkorLib::Versioning.get_version(moduledir)
+                    #v3.should == v2
+                end
+            end
+        end
+
+    #end #configatron.temp
+
+end # describe FalkorLib::Versioning

data/spec/falkorlib/versioning_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # versioning_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Mar 2014-07-01 12:26 svarrette>
+# Time-stamp: <Dim 2014-08-31 21:57 svarrette>
 #
 # @description Check the versioning operations
 #
@@ -20,7 +20,10 @@ describe FalkorLib::Versioning do
     include FalkorLib::Common
 
     dir   = Dir.mktmpdir
-    afile = File.join(dir, 'a_file')
+	
+	workdir = File.join(dir, 'version')
+	
+    afile = File.join(workdir, 'a_file')
     versionfile     = FalkorLib.config[:versioning][:source]['file'][:filename]
     default_version = FalkorLib.config[:versioning][:default]
     workingversion = {
@@ -29,6 +32,11 @@ describe FalkorLib::Versioning do
         :minor   => '1.3.0',
         :major   => '2.0.0'
     }
+	
+	before :all do
+		FileUtils.mkdir_p workdir
+		FalkorLib.config[:versioning][:type] = 'file'
+	end 
 
     after :all do
         FileUtils.remove_entry_secure dir
@@ -40,34 +48,34 @@ describe FalkorLib::Versioning do
         it "#get_version -- get default version #{default_version}" do
             if command?('git_flow')
                 STDIN.should_receive(:gets).and_return('Yes')
-                t = FalkorLib::GitFlow.init(dir)
+                t = FalkorLib::GitFlow.init(workdir)
                 t.should == 0
             else
-                t = FalkorLib::Git.init(dir)
+                t = FalkorLib::Git.init(workdir)
                 t.should be_true
             end
-            v = FalkorLib::Versioning.get_version(dir)
+            v = FalkorLib::Versioning.get_version(workdir)
             v.should == default_version
         end
 
         it "#get_version -- should get the '#{workingversion[:default]}' version set in the file #{versionfile}" do
-            execute "echo #{workingversion[:default]} > #{dir}/#{versionfile}"
-            v = FalkorLib::Versioning.get_version(dir)
+            execute "echo #{workingversion[:default]} > #{workdir}/#{versionfile}"
+            v = FalkorLib::Versioning.get_version(workdir)
             v.should == workingversion[:default]
         end
 
         it "#major -- should collect the major version" do
-            v = FalkorLib::Versioning.get_version(dir)
+            v = FalkorLib::Versioning.get_version(workdir)
             m = FalkorLib::Versioning.major(v)
             m.should == '1'
         end
         it "#minor -- should collect the minor version" do
-            v = FalkorLib::Versioning.get_version(dir)
+            v = FalkorLib::Versioning.get_version(workdir)
             m = FalkorLib::Versioning.minor(v)
             m.should == '2'
         end
         it "#patch -- should collect the patch version" do
-            v = FalkorLib::Versioning.get_version(dir)
+            v = FalkorLib::Versioning.get_version(workdir)
             m = FalkorLib::Versioning.patch(v)
             m.should == '3'
         end
@@ -75,24 +83,24 @@ describe FalkorLib::Versioning do
 
         it "#set_version -- set version #{default_version} in version file #{versionfile}" do
             STDIN.should_receive(:gets).and_return('no')
-            v = FalkorLib::Versioning.set_version(default_version, dir)
+            v = FalkorLib::Versioning.set_version(default_version, workdir)
             v.should == 0
-            v = FalkorLib::Versioning.get_version(dir)
+            v = FalkorLib::Versioning.get_version(workdir)
             v.should == default_version
         end
 
         FalkorLib.config[:versioning][:levels].reverse.each do |level|
             it "#set_version #bump -- #{level} bump version number from #{workingversion[:default]} to #{workingversion[level.to_sym]}" do
                 # restore version file
-                execute "echo #{workingversion[:default]} > #{dir}/#{versionfile}"
-                v  = FalkorLib::Versioning.get_version(dir)
+                execute "echo #{workingversion[:default]} > #{workdir}/#{versionfile}"
+                v  = FalkorLib::Versioning.get_version(workdir)
                 v.should == workingversion[:default]
                 v2 = FalkorLib::Versioning.bump(v, level.to_sym)
                 v2.should == workingversion[level.to_sym]
                 STDIN.should_receive(:gets).and_return('no')
-                d = FalkorLib::Versioning.set_version(v2, dir)
+                d = FalkorLib::Versioning.set_version(v2, workdir)
                 d.should == 0
-                v3 = FalkorLib::Versioning.get_version(dir)
+                v3 = FalkorLib::Versioning.get_version(workdir)
                 v3.should == v2
             end
         end

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

@@ -1,19 +1,28 @@
 {
-    "name":    "<%= config[:name] %>",
-    "version": "<%= config[:version] %>",
-    "author":  "<%= config[:author] %>",
-    "mail":    "<%= config[:mail] %>",
-    "summary": "<%= config[:summary] %>",
-    "description": "<%= config[:description] %>",
-    "license": "<%= config[:license] %>",
-    "source":  "<%= config[:source] %>",
-    "project_page": "<%= config[:project_page] %>",
-    "issues_url":   "<%= config[:issues_url] %>",
-    "dependencies": [
-        { "name": "puppetlabs-stdlib", "version_range": ">= 1.0.0" }
-    ],
-    "operatingsystem_support": [
-        {  "operatingsystem":"Debian", "operatingsystemrelease": [ "6", "7" ] }
-    ],
-    "tags": <%= config[:tags] %>
+  "name": "<%= config[:name] %>",
+  "version": "<%= config[:version] %>",
+  "author": "<%= config[:author] %>",
+  "mail": "<%= config[:mail] %>",
+  "summary": "<%= config[:summary] %>",
+  "description": "<%= config[:description] %>",
+  "license": "<%= config[:license] %>",
+  "source": "<%= config[:source] %>",
+  "project_page": "<%= config[:project_page] %>",
+  "issues_url": "<%= config[:issues_url] %>",
+  "dependencies": [
+    {
+      "name": "puppetlabs-stdlib",
+      "version_range": ">= 1.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "tags": <%= config[:tags] %>
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -315,6 +315,7 @@ files:
 - spec/falkorlib/gitflow_spec.rb
 - spec/falkorlib/puppet_modules_spec.rb
 - spec/falkorlib/versioning_gem_spec.rb
+- spec/falkorlib/versioning_puppet_module_spec.rb
 - spec/falkorlib/versioning_spec.rb
 - spec/falkorlib_spec.rb
 - spec/spec_helper.rb
@@ -364,6 +365,7 @@ test_files:
 - spec/falkorlib/gitflow_spec.rb
 - spec/falkorlib/puppet_modules_spec.rb
 - spec/falkorlib/versioning_gem_spec.rb
+- spec/falkorlib/versioning_puppet_module_spec.rb
 - spec/falkorlib/versioning_spec.rb
 - spec/falkorlib_spec.rb
 - spec/spec_helper.rb