falkorlib 0.2.15 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da39e1f9507bfe588f465193ac436393c5774e2
-  data.tar.gz: 8edc82df6d1acee0a5384c7343004e082ffa916d
+  metadata.gz: f29a576f48785a231d70a51920d2313915e135aa
+  data.tar.gz: ec1536f6f49fe5e96ccbd888f4f30aa77db49756
 SHA512:
-  metadata.gz: f5615b6d4122c97d737d0e2b69512c9b4582fd202257ed44c079c310c7d75a15784f960e1d5787e107463a65761748e47d3dc30a16aed1a7dd7b340c9df254c2
-  data.tar.gz: 07250c5253f5406bd2c414b46ea8db57d41ac94a8a20121b577662f58a2156d2bd581897ce0c97b4624436edfb874dace950770b9b2d881e7ad492f68fc9cf5b
+  metadata.gz: 9f4c56f5feedd8a4bd4ff135654ff9e846267946b06f396920045f1bf27d20b09f21325c9ebb2b4acefcb505742bba13f2fc56a0339b4427eb6123e2120c5dcd
+  data.tar.gz: 096f0cd26cf79b78ffbdda9fbb9ced24a6ad566055a510a833769d602cf5ad7824459b59d5b8447966325dc313d962da10fb7ffe4ab7f5b74e5729451720a488

data/Gemfile.lock

@@ -1,10 +1,12 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.2.15)
+    falkorlib (0.3.0)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
       git_remote_branch (~> 0)
+      json (~> 1.8)
+      license-generator
       minigit (~> 0)
       rake (~> 10.1, >= 10.1.0)
       term-ansicolor (~> 1.3)
@@ -41,6 +43,8 @@ GEM
     json (1.8.1)
     launchy (2.4.2)
       addressable (~> 2.3)
+    license-generator (0.4.1)
+      thor
     method_source (0.8.2)
     minigit (0.0.4)
     multi_json (1.10.1)
@@ -73,7 +77,8 @@ GEM
     slop (3.5.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    tins (1.3.0)
+    thor (0.19.1)
+    tins (1.3.2)
     travis (1.6.14)
       addressable (~> 2.3)
       backports

data/README.md

@@ -70,11 +70,14 @@ This library features two aspects
             	c.debug = true
         	end
   	
+    You can also place a special file `.falkorlib.yaml` to customize the
+    FalkorLib settings 
    	 
   * `FalkorLib::Git`: all [git](http://git-scm.com/) operations
   * `FalkorLib::GitFlow`: all [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) operations
   * `FalkorLib::Version`: for the [semantic versioning](http://semver.org/)
     management of your project. 
+  * `FalkorLib::Puppet`: for all [puppet](http://puppetlabs.com) operations
 
 * Some [rake](https://github.com/jimweirich/rake) tasks to facilitate common operations.
   In general you can simply embedded my tasks by adding the following header in your `Rakefile`:
@@ -152,6 +155,9 @@ _Note_: you probably want to
 [take a look at that script content](https://github.com/Falkor/falkorlib/blob/devel/binscripts/bootstrap.sh)
 before running the above command.
 
+Alternatively, assuming you have installed the `falkorlib` gem, you can create a
+minimal `Rakefile` (containing `require 'falkorlib'`) and run `rake bootstrap:rvm`.
+ 
 You can now complete your `Rakefile` depending on the tasks you wish to see. 
 Below is a detailed overview of the implemented rake tasks in `FalkorLib`.
 
@@ -221,10 +227,8 @@ $> rake -T
 rake falkorlib:conf           # Print the current configuration of FalkorLib
 rake git:feature:finish       # Finalize the feature operation
 rake git:feature:start[name]  # Start a new feature operation on the repository using the git-flow framework
-rake git:fetch                # Fetch the latest changes on remotes
 rake git:flow:init            # Initialize your local clone of the repository for the git-flow management
-rake git:push                 # Push your modifications onto the remote branches
-rake git:up                   # Update your local copy of the repository from GIT server
+rake setup                    # Setup the repository
 rake version:bump:major       # Prepare the major release of the repository
 rake version:bump:minor       # Prepare the minor release of the repository
 rake version:bump:patch       # Prepare the patch release of the repository

data/falkorlib.gemspec

@@ -130,7 +130,8 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency("term-ansicolor", "~> 1.3")
 	s.add_runtime_dependency("configatron",    "~> 3.2")
 	s.add_runtime_dependency("awesome_print", "~> 1.2")
-
+	s.add_runtime_dependency("json", "~> 1.8")
+	s.add_runtime_dependency("license-generator")
 
     #
     # One call to add_dependency('gem_name', 'gem version requirement') for each

data/lib/falkorlib.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Ven 2014-06-06 17:06 svarrette>
+# Time-stamp: <Sam 2014-08-23 23:18 svarrette>
 ################################################################################
 #                   _____     _ _              _     _ _
 #                   |  ___|_ _| | | _____  _ __| |   (_) |__
@@ -29,11 +29,23 @@ end
 require 'yaml'
 
 # Sebastien Varrette aka Falkor's Common library to share Ruby code
-# and `{rake,cap}` tasks 
+# and `{rake,cap}` tasks
 module FalkorLib
 
+    # Return the root directory of the gem
+	def self.root
+        File.expand_path '../..', __FILE__
+    end
+
+	def self.lib
+		File.join root, 'lib'
+	end
+
+	def self.templates
+		File.join root, 'templates'
+	end
+
 end # module FalkorLib
 
 require "falkorlib/version"
 require "falkorlib/loader"
-

data/lib/falkorlib/common.rb

@@ -1,10 +1,11 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sam 2014-07-12 21:43 svarrette>
+# Time-stamp: <Lun 2014-08-25 23:43 svarrette>
 ################################################################################
 
 require "falkorlib"
 require 'open3'
+require 'erb'      # required for module generation
 
 
 module FalkorLib #:nodoc:
@@ -165,57 +166,71 @@ module FalkorLib #:nodoc:
             exit_status
         end
 
-        ## List items from a glob pattern
-        ## list_items
+        ## List items from a glob pattern to ask for a unique choice
+        # Supported options:
+        #   :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   
         def list_items(glob_pattern, options = {})
             list  = { 0 => 'Exit' }
             index = 1
-	        raw_list = { }
-
-	        Dir["#{glob_pattern}"].each do |elem|
-		        #puts "=> element '#{elem}' - dir = #{File.directory?(elem)}; file = #{File.file?(elem)}"
-		        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_exclude].nil?
-			        select_entry = false
-			        options[:pattern_exclude].each do |pattern|
-				        #puts "considering pattern '#{pattern}' on entry '#{entry}'"
-				        select_entry |= entry =~ /#{pattern}/
-			        end
-			        next if select_entry
-		        end 
-		        #puts "selected entry = '#{entry}'"
-		        list[index]     = entry
-		        raw_list[index] = elem
-		        index += 1
+            raw_list = { }
+
+            Dir["#{glob_pattern}"].each do |elem|
+                #puts "=> element '#{elem}' - dir = #{File.directory?(elem)}; file = #{File.file?(elem)}"
+                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_exclude].nil?
+                    select_entry = false
+                    options[:pattern_exclude].each do |pattern|
+                        #puts "considering pattern '#{pattern}' on entry '#{entry}'"
+                        select_entry |= entry =~ /#{pattern}/
+                    end
+                    next if select_entry
+                end
+                #puts "selected entry = '#{entry}'"
+                list[index]     = entry
+                raw_list[index] = elem
+                index += 1
             end
-	        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
-	        # puts list.to_yaml
-	        # answer = ask("=> #{text}", "#{default_idx}")
-	        # raise SystemExit.new('exiting selection') if answer == '0'
-	        # raise RangeError.new('Undefined index')   if Integer(answer) >= list.length
-	        # raw_list[Integer(answer)]
-	        select_from(list, text, default_idx, raw_list)
+            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
+            # puts list.to_yaml
+            # answer = ask("=> #{text}", "#{default_idx}")
+            # raise SystemExit.new('exiting selection') if answer == '0'
+            # raise RangeError.new('Undefined index')   if Integer(answer) >= list.length
+            # raw_list[Integer(answer)]
+            select_from(list, text, default_idx, raw_list)
         end
 
         ## Display a indexed list to select an i
         def select_from(list, text = 'Select the index', default_idx = 0, raw_list = list)
-	        puts list.to_yaml
-	        answer = ask("=> #{text}", "#{default_idx}")
-	        raise SystemExit.new('exiting selection') if answer == '0'
-	        raise RangeError.new('Undefined index')   if Integer(answer) >= list.length
-	        raw_list[Integer(answer)] 
+            error "list and raw_list differs in size" if list.size != raw_list.size
+            l     = list
+            raw_l = raw_list
+            if list.kind_of?(Array)
+                l = raw_l = { 0 => 'Exit' }
+                list.each_with_index do |e, idx|
+                    l[idx+1] = e
+                    raw_l[idx+1] = raw_list[idx]
+                end
+            end
+            puts l.to_yaml
+            answer = ask("=> #{text}", "#{default_idx}")
+            raise SystemExit.new('exiting selection') if answer == '0'
+            raise RangeError.new('Undefined index')   if Integer(answer) >= l.length
+            raw_l[Integer(answer)]
         end # select_from
 
 
@@ -237,6 +252,88 @@ module FalkorLib #:nodoc:
             end
         end
 
+        #################################
+        ### [ERB] template generation ###
+        #################################
+
+        # Bootstrap the destination directory `rootdir` using the template
+        # directory `templatedir`. the hash table `config` hosts the elements to
+        # feed ERB files which **should** have the extension .erb.
+        # The initialization is performed as follows:
+        # * a rsync process is initiated to duplicate the directory structure
+        #   and the symlinks, and exclude .erb files 
+        # * each erb files (thus with extension .erb) is interpreted, the
+        #   corresponding file is generated without the .erb extension
+        # 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 = {})
+            error "Unable to find the template directory" unless File.directory?(templatedir)
+            warning "about to initialize/update the directory #{rootdir}"
+            really_continue?
+            run %{ mkdir -p #{rootdir} } unless File.directory?( rootdir )
+            run %{ rsync --exclude '*.erb' -avzu #{templatedir}/ #{rootdir}/ }
+            Dir["#{templatedir}/**/*.erb"].each do |erbfile|
+		        relative_outdir = Pathname.new( File.realpath( File.dirname(erbfile) )).relative_path_from Pathname.new(templatedir)
+		        filename = File.basename(erbfile, '.erb')
+		        outdir   = File.realpath( File.join(rootdir, relative_outdir.to_s) )		        
+		        outfile  = File.join(outdir, filename)
+		        unless options[:erb_exclude].nil?
+			        exclude_entry = false
+			        options[:erb_exclude].each do |pattern|
+				        exclude_entry |= erbfile =~ /#{pattern}/
+			        end
+			        if exclude_entry
+				        info "copying non-interpreted ERB file"
+				        # copy this file since it has been probably excluded from teh rsync process
+				        run %{ cp #{erbfile} #{outdir}/ }
+				        next 
+			        end 
+		        end 
+		        # Let's go
+		        info "updating '#{relative_outdir.to_s}/#{filename}'"
+		        puts "  using ERB template '#{erbfile}'"
+		        template = File.read("#{erbfile}")
+                output   = ERB.new(template, nil, '<>')
+		        if File.exists?( outfile )
+			        warn "the file '#{outfile}' already exists and will be overwritten."
+			        error "TODO: watch the diff ;)"
+		        else 
+			        watch =  ask( cyan("  ==> Do you want to see the generated file before commiting the writing (y|N)"), 'No')
+			        puts output.result(binding) if watch =~ /y.*/i
+		        end 
+		        proceed = ask( cyan("  ==> proceed with the writing (Y|n)"), 'Yes')
+		        next if proceed =~ /n.*/i
+		        info("=> writing #{outfile}")
+                File.open("#{outfile}", "w+") do |f|
+			        f.puts output.result(binding)
+                end
+            end    
+        end
+
+        ### RVM init
+        def init_rvm(rootdir = Dir.pwd, gemset = '')
+	        rvm_files = {
+		        :version => File.join(rootdir, '.ruby-version'),
+		        :gemset  => File.join(rootdir, '.ruby-gemset')
+	        }
+	        unless File.exists?( "#{rvm_files[:version]}")
+		        v = select_from(FalkorLib.config[:rvm][:rubies], 
+		                        "Select RVM ruby to configure for this directory", 
+		                        3)
+		        File.open( rvm_files[:version], 'w') do |f|
+			        f.puts v
+		        end
+	        end 
+	        unless File.exists?( "#{rvm_files[:gemset]}")
+		        g = gemset.empty? ? ask("Enter RVM gemset name for this directory", File.basename(rootdir)) : gemset
+		        File.open( rvm_files[:gemset], 'w') do |f|
+			        f.puts g
+		        end
+	        end 
+	        
+        end 
+
 
     end
 end

data/lib/falkorlib/config.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Ven 2014-06-20 12:04 svarrette>
+# Time-stamp: <Lun 2014-08-25 22:29 svarrette>
 ################################################################################
 # FalkorLib Configuration
 #
@@ -40,8 +40,12 @@ module FalkorLib #:nodoc:
     module Config #:nodoc:
         # Defaults global settings
         DEFAULTS = {
-            :debug => false,
-            :root  => Dir.pwd
+            :debug      => false,
+            :root       => Dir.pwd,
+		    :custom_cfg => '.falkorlib.yaml',
+		    :rvm => {
+			    :rubies => [ '1.9.3', '2.0.0', '2.1.0']
+		    }
         }
 
         module_function
@@ -50,11 +54,17 @@ module FalkorLib #:nodoc:
         # The hash is built depending on the loaded files. 
         def default
             res = FalkorLib::Config::DEFAULTS
-            $LOADED_FEATURES.each do |path|
-                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')
+	        $LOADED_FEATURES.each do |path|
+                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')
             end
+	        # Check the potential local customizations
+	        custom_cfg = File.join( res[:root], res[:custom_cfg])
+	        if File.exists?( custom_cfg )
+		        res.merge!( load_config( custom_cfg ) )
+	        end 
             res
         end
 

data/lib/falkorlib/git/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Jeu 2014-06-26 12:35 svarrette>
+# Time-stamp: <Mar 2014-08-26 11:54 svarrette>
 ################################################################################
 # Interface for the main Git operations
 #
@@ -100,6 +100,7 @@ module FalkorLib  #:nodoc:
                 end
             end
 	        exit_status = 1
+	        #info "Initialize "
 	        Dir.chdir( path ) do 
 		        execute "git init" unless FalkorLib.config.debug 
 		        exit_status = $?.to_i
@@ -209,8 +210,6 @@ module FalkorLib  #:nodoc:
 	        g.capturing.ls_files.split
         end 
 
-
-
         ## Add a file/whatever to Git and commit it
         def add(path, msg = "")
 	        exit_status = 0
@@ -251,6 +250,11 @@ module FalkorLib  #:nodoc:
             g.capturing.remote.split()
         end
 
+        ## remotes?(path = Dir.pw)
+        def remotes?(path = Dir.pwd)
+	        return ! remotes(path).empty?
+        end 
+
         ## Initialize git subtrees from the configuration
         def submodule_init(path = Dir.pwd)
             exit_status  = 1

data/lib/falkorlib/git/flow.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Jeu 2014-06-26 10:45 svarrette>
+# Time-stamp: <Mar 2014-08-26 11:57 svarrette>
 ################################################################################
 # Management of Git Flow operations
 
@@ -49,9 +49,11 @@ module FalkorLib
                 unless FalkorLib::Git.has_commits?( git_root_dir)
 	                warn "Not yet any commit detected in this repository."
 	                readme = 'README.md'
-	                answer = ask(cyan("=> Shall one be initiated with a #{readme} file (Y|n)?"), 'Yes')
-	                exit 0 if answer =~ /n.*/i
-	                FileUtils.touch(readme)
+	                unless File.exists?( readme )
+		                answer = ask(cyan("=> initialize a commit with a #{readme} file (Y|n)?"), 'Yes')
+		                exit 0 if answer =~ /n.*/i
+		                FileUtils.touch(readme)
+	                end 
 	                FalkorLib::Git.add(readme, "Initiate the repository with a '#{readme}' file")
                 end
 		        branches     = FalkorLib::Git.list_branch(path)
@@ -104,6 +106,16 @@ module FalkorLib
 	        exit_status
         end
 
+        ## Check if git-flow is initialized
+        def init?(path = Dir.pwd)
+	        res = FalkorLib::Git.init?(path)
+	        Dir.chdir(path) do 
+		        gf_check = `git config --get-regexp 'gitflow*'`
+		        res &= ! gf_check.empty? 
+	        end
+	        res
+        end # init?(path = Dir.pwd)
+
 
         ## generic function to run any of the gitflow commands
         def command(name, type = 'feature', action = 'start', path = Dir.pwd, optional_args = '')

data/lib/falkorlib/loader.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mer 2014-06-18 17:17 svarrette>
+# Time-stamp: <Lun 2014-08-25 21:04 svarrette>
 ################################################################################
 # Place the component you wish to see loaded  
 
@@ -8,4 +8,5 @@ require "falkorlib/config"
 require "falkorlib/common"
 require "falkorlib/git"
 require "falkorlib/versioning"
+require "falkorlib/puppet"
 

data/lib/falkorlib/puppet.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Lun 2014-08-25 21:35 svarrette>
+################################################################################
+# Management of [Puppet](http://puppetlabs.com/) operations
+
+require "falkorlib"
+
+module FalkorLib #:nodoc:
+
+end # module FalkorLib
+
+require "falkorlib/puppet/base"
+require "falkorlib/puppet/modules"
+
+
+ 

data/lib/falkorlib/puppet/base.rb

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Lun 2014-08-25 21:34 svarrette>
+################################################################################
+# Interface for the main Puppet operations
+#
+
+require "falkorlib"
+require "falkorlib/common"
+
+
+include FalkorLib::Common
+
+module FalkorLib  #:nodoc:
+    module Config
+	    module Puppet
+		    # Puppet defaults for FalkorLib
+		    DEFAULTS = {
+			    :modulesdir => File.join(Dir.pwd, 'modules')
+		    } 
+	    end 
+    end 
+
+    module Puppet  #:nodoc
+	    
+    end
+
+
+
+end 

data/lib/falkorlib/puppet/modules.rb

@@ -0,0 +1,132 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Mar 2014-08-26 14:17 svarrette>
+################################################################################
+# Interface for the main Puppet Module operations
+#
+
+require "falkorlib"
+require "falkorlib/common"
+
+require "pathname"
+
+include FalkorLib::Common
+
+module FalkorLib  #:nodoc:
+    module Config
+        module Puppet
+            module Modules
+                DEFAULTS = {
+                    :metadata => {
+                        :name         => '',
+                        :version      => '0.0.1',
+                        :author       => "#{ENV['GIT_AUTHOR_NAME']}",
+                        :mail         => "#{ENV['GIT_AUTHOR_EMAIL']}",
+                        :summary      => "rtfm",
+                        :description  => '',
+                        :license      => 'GPLv3',
+                        :source       => '',
+                        :project_page => '',
+                        :issue_url    => '',
+                        :dependencies => [],
+                        :operatingsystem_support => [],
+                        :tags         => []
+                    },
+                    :licenses => [
+                                  "Apache-2.0",
+                                  "BSD",
+                                  "GPL-2.0",
+                                  "GPL-3.0",
+                                  "LGPL-2.1",
+                                  "LGPL-3.0",
+                                  "MIT",
+                                  "Mozilla-2.0"
+                                 ]
+                }
+            end
+        end
+    end
+
+    # Puppet actions
+    module Puppet
+        # Management of Puppet Modules operations
+        module Modules
+            module_function
+
+            ## 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|
+                    next if v.kind_of?(Array) or k == :license
+		            next if k == :name and ! name.empty?
+                    default_answer = case k
+                                     when :project_page
+                                         config[:source].nil? ? v : config[:source]
+                                     when :name
+                                         File.basename(rootdir).gsub(/^puppet-/, '')
+                                     when :issue_url
+                                         config[:project_page].nil? ? v : "#{config[:project_page]}/issues"
+                                     when :description
+	                                     config[:summary].nil? ? v : "#{config[:summary]}"
+                                     when :source
+	                                     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
+
+	            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)
+		            end 
+		            [ 'metadata.json', 'LICENSE', '.gitignore', 'Gemfile', 'Rakefile'].each do |f| 
+			            FalkorLib::Git.add(File.join(rootdir, f))
+		            end
+	            end 
+            end # init
+
+
+        end # module FalkorLib::Puppet::Modules
+    end # module FalkorLib::Puppet
+end # module FalkorLib

data/lib/falkorlib/puppet_tasks.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Lun 2014-08-25 21:46 svarrette>
+################################################################################
+#
+# FalkorLib rake tasks to pilot Puppet operations
+#
+
+require 'rake'
+require 'falkorlib'
+require 'falkorlib/tasks'
+
+module FalkorLib #:nodoc:
+	class PuppetTasks
+		include Rake::DSL if defined? Rake::DSL
+
+		# Install the puppet tasks for Rake
+        def install_tasks
+            load 'falkorlib/tasks/puppet_modules.rake'
+        end
+	end
+end
+
+FalkorLib::PuppetTasks.new.install_tasks

data/lib/falkorlib/tasks.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mer 2014-08-20 17:21 svarrette>
+# Time-stamp: <Lun 2014-08-25 23:25 svarrette>
 ################################################################################
 #
 # Default FalkorLib rake tasks
@@ -17,7 +17,7 @@ FalkorLib.config.debug = ARGV.include?('DEBUG')
 #.....................
 namespace :falkorlib do
 	###########  falkorlib:conf   ###########
-	#desc "Print the current configuration of FalkorLib"
+	desc "Print the current configuration of FalkorLib"
 	task :conf do
 		puts FalkorLib.config.to_yaml
 	end 
@@ -37,12 +37,18 @@ namespace :bootstrap do
 	task :rvm do 
 		info "Boostrap RVM for this repository -- see https://rvm.io"
 		error "RVM is not installed -- see https://rvm.io/rvm/install for instructions" unless command?('rvm')
-		['version', 'gemset'].each do |t| 
-			error "unable to find the .ruby-#{t} file" unless File.exists?(".ruby-#{t}")
-		end
+		init_rvm(Dir.pwd)
+		# ['version', 'gemset'].each do |t| 
+		# 	error "unable to find the .ruby-#{t} file" unless File.exists?(".ruby-#{t}")
+		# end
 		info "=> initialize RVM -- see http://rvm.io"
 		run %{ rvm install `cat .ruby-version` }
-		
+		rvm_current = `rvm current`
+		if rvm_current.empty? or rvm_current != "`cat .ruby-version`@`cat .ruby-gemset`"
+			warn "You need to manually force the reloading of the RVM configuration."
+			warn "To do that, simply run \n\t\tcd .. && cd -"
+			error "manual RVM reloading required"
+		end
 		#rvmenv = %x( rvm env --path -- `cat .ruby-version`@`cat .ruby-gemset`)
 		# info "=> Force reloading RVM configuration within $PWD"
 		# run %{ 

data/lib/falkorlib/tasks/gitflow.rake

@@ -1,6 +1,6 @@
 ################################################################################
 # gitflow.rake - Special tasks for the management of Git [Flow] operations
-# Time-stamp: <Mar 2014-08-19 10:20 svarrette>
+# Time-stamp: <Sam 2014-08-23 15:19 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -16,9 +16,9 @@ namespace :git do
     include FalkorLib::Common
     git_root_dir = FalkorLib::Git.rootdir
 
-	###########  git:init   ###########
-	#desc "Initialize Git repository"
-	task :init => [ 'git:flow:init' ]
+    ###########  git:init   ###########
+    #desc "Initialize Git repository"
+    task :init => [ 'git:flow:init' ]
 
     #.....................
     namespace :flow do
@@ -26,7 +26,7 @@ namespace :git do
         ###########   git:flow:init   ###########
         desc "Initialize your local clone of the repository for the git-flow management"
         task :init do |t|
-			info t.comment
+            info t.comment
             FalkorLib::GitFlow.init(git_root_dir)
         end # task init
 
@@ -45,7 +45,7 @@ namespace :git do
             Rake::Task['git:up'].invoke unless FalkorLib::Git.remotes.empty?
             info "=> prepare new 'feature' using git flow"
             o = FalkorLib::GitFlow.start('feature', name)
-			error "Git flow feature operation failed" unless o == 0
+            error "Git flow feature operation failed" unless o == 0
             # Now you should be in the new branch
         end
 
@@ -61,7 +61,7 @@ namespace :git do
             info t.comment
             o = FalkorLib::GitFlow.finish('feature', name)
             error "Git flow feature operation failed" unless o == 0
-			unless FalkorLib::Git.remotes.empty?
+            unless FalkorLib::Git.remotes.empty?
                 info "=> about to update remote tracked branches"
                 really_continue?
                 Rake::Task['git:push'].invoke
@@ -103,22 +103,22 @@ namespace :version do
                 Rake::Task['git:up'].invoke unless FalkorLib::Git.remotes.empty?
                 info "=> prepare release using git flow"
                 o = FalkorLib::GitFlow.start('release', release_version)
-				error "Git flow release process failed" unless o == 0
+                error "Git flow release process failed" unless o == 0
                 # Now you should be in the new branch
                 current_branch = FalkorLib::Git.branch?
                 expected_branch = FalkorLib.config[:gitflow][:prefix][:release] + release_version
                 if (current_branch == expected_branch)
                     FalkorLib::Versioning.set_version(release_version)
-	                if (! FalkorLib.config[:versioning].nil?) && 
-			                FalkorLib.config[:versioning][:type] == 'gem' &&
-			                File.exists?(File.join(FalkorLib::Git.rootdir, 'Gemfile'))
-		                info "Updating Gemfile information"
-		                run %{
-                           # Update cache info 
+                    if (! FalkorLib.config[:versioning].nil?) &&
+                            FalkorLib.config[:versioning][:type] == 'gem' &&
+                            File.exists?(File.join(FalkorLib::Git.rootdir, 'Gemfile'))
+                        info "Updating Gemfile information"
+                        run %{
+                           # Update cache info
                            bundle list > /dev/null
                            git commit -s -m "Update Gemfile.lock accordingly" Gemfile.lock
                         }
-	                end 
+                    end
                     warning "The version number has already been bumped"
                     warning "==> run 'rake version:release' to finalize the release and merge the current version of the repository into the '#{FalkorLib.config[:gitflow][:branches][:master]}' branch"
                 else
@@ -128,35 +128,37 @@ namespace :version do
         end
     end # namespace version:bump
 
-	###########   release   ###########
-	desc "Finalize the release of a given bumped version"
-	task :release do |t|
-		version = FalkorLib::Versioning.get_version
-		branch  = FalkorLib::Git.branch?
-		expected_branch = FalkorLib.config[:gitflow][:prefix][:release] + version
-		error "You are not in the '#{expected_branch}' branch but in the '#{branch}' one. May be you forgot to run 'rake version:bump:{patch,minor,major}' first" if branch != expected_branch
-		info "=> Finalize the release of the version '#{version}' into the '#{FalkorLib.config[:gitflow][:branches][:master]}' branch/environment"
-		o = FalkorLib::GitFlow.finish('release', version, Dir.pwd, '-s')
-		error "Git flow release process failed" unless o == 0
-		info("=> about to update remote tracked branches")
-		really_continue?
-		FalkorLib.config[:gitflow][:branches].each do |type, branch|
-			run %{ 
-               git checkout #{branch} 
-               git push origin
-            }
-		end
-		run %{ git push origin --tags }
-		#info "Update the changelog"
-		if (! FalkorLib.config[:versioning].nil?) && 
-				FalkorLib.config[:versioning][:type] == 'gem'
-			warn "About to push the released new gem (version #{version}) to the gem server (rybygems.org)"
-			really_continue?
-			Rake::Task['gem:release'].invoke
-		end 
-
-		#Rake::Task['git:push'].invoke
-	end # task version:release 
+    ###########   release   ###########
+    desc "Finalize the release of a given bumped version"
+    task :release do |t|
+        version = FalkorLib::Versioning.get_version
+        branch  = FalkorLib::Git.branch?
+        expected_branch = FalkorLib.config[:gitflow][:prefix][:release] + version
+        error "You are not in the '#{expected_branch}' branch but in the '#{branch}' one. May be you forgot to run 'rake version:bump:{patch,minor,major}' first" if branch != expected_branch
+        info "=> Finalize the release of the version '#{version}' into the '#{FalkorLib.config[:gitflow][:branches][:master]}' branch/environment"
+        o = FalkorLib::GitFlow.finish('release', version, Dir.pwd, '-s')
+        error "Git flow release process failed" unless o == 0
+        if FalkorLib::Git.remotes?
+            info("=> about to update remote tracked branches")
+            really_continue?
+            FalkorLib.config[:gitflow][:branches].each do |type, branch|
+                run %{
+                   git checkout #{branch}
+                   git push origin
+                }
+            end
+            run %{ git push origin --tags }
+        end
+        #info "Update the changelog"
+        if (! FalkorLib.config[:versioning].nil?) &&
+                FalkorLib.config[:versioning][:type] == 'gem'
+            warn "About to push the released new gem (version #{version}) to the gem server (rybygems.org)"
+            really_continue?
+            Rake::Task['gem:release'].invoke
+        end
+
+        #Rake::Task['git:push'].invoke
+    end # task version:release
 
 
 

data/lib/falkorlib/tasks/puppet.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Lun 2014-08-25 21:46 svarrette>
+################################################################################
+#
+# FalkorLib rake tasks to pilot Puppet operations
+#
+
+require 'rake'
+require 'falkorlib'
+require 'falkorlib/tasks'
+
+module FalkorLib #:nodoc:
+	class PuppetTasks
+		include Rake::DSL if defined? Rake::DSL
+
+		# Install the puppet tasks for Rake
+        def install_tasks
+            load 'falkorlib/tasks/puppet_modules.rake'
+        end
+	end
+end
+
+FalkorLib::PuppetTasks.new.install_tasks

data/lib/falkorlib/tasks/puppet_modules.rake

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# puppet_modules.rake - Special tasks for the management of Puppet modules
+# Time-stamp: <Lun 2014-08-25 22:54 svarrette>
+#
+# Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+#               http://varrette.gforge.uni.lu
+################################################################################
+
+require 'falkorlib'
+require 'falkorlib/tasks'
+require 'falkorlib/puppet'
+
+#.....................
+namespace :bootstrap do
+	#.....................
+	namespace :puppet do
+		
+		###########  bootstrap:puppet:module   ###########
+		desc "Bootstrap a new Puppet module"
+		task :module, [:name] do |t, args|
+			info "#{t.comment}"
+			name = args.name == 'name' ? ask("Enter the module name") : args.name 
+			error "You need to provide a module name" unless name != ''
+			error "The module name cannot contain spaces" if name =~ /\s+/
+			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)
+		end 
+
+
+	end # namespace bootstrap:puppet
+end # namespace bootstrap
+

data/lib/falkorlib/tasks/rspec.rake

@@ -32,7 +32,7 @@ begin
     # Glob pattern to match files.
     #t.pattern = "spec/**/test_*.rb"
 	#t.pattern = "spec/**/*_spec.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, 2, 15  
+	    MAJOR, MINOR, PATCH = 0, 3, 0  
 	    
 	    module_function
 	    
@@ -71,3 +71,4 @@ module FalkorLib #:nodoc:
     # Shorter version of the Gem's VERSION
     VERSION = Version.to_s
 end
+

data/lib/falkorlib/versioning.rb

@@ -1,11 +1,12 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2014-07-01 11:13 svarrette>
+# Time-stamp: <Sam 2014-08-23 12:32 svarrette>
 ################################################################################
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #
 # FalkorLib Version management
 #
+require 'json'
 
 module FalkorLib #:nodoc:
 
@@ -28,6 +29,9 @@ module FalkorLib #:nodoc:
                         #:setmethod => 'FalkorLib::Version.set',
                         #:pattern   => '^(\s*)MAJOR\s*,\s*MINOR,\s*PATCH\s*=\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)'
                     },
+			        'puppet_module' => {
+				        :filename => 'metadata.json'
+			        },
                     'tag' => {
                         :suffix => 'v'
                     },
@@ -75,6 +79,10 @@ module FalkorLib #:nodoc:
             when 'gem'
                 getmethod = source[:getmethod ]
                 version = eval( getmethod ) unless (getmethod.nil? || getmethod.empty?)
+            when 'puppet_module'
+	            jsonfile = File.join( rootdir, source[:filename] )
+	            metadata = JSON.parse( IO.read( jsonfile ) )
+	            version  = metadata["version"]
             end
             version
         end
@@ -101,6 +109,13 @@ module FalkorLib #:nodoc:
                     f.rewind
                     f.write(text)
                 end
+            when 'puppet_module'
+	            info "=> writing version changes in #{source[:filename]}"
+	            metadata = JSON.parse( IO.read( versionfile ) )
+	            metadata["version"] = version
+	            File.open(versionfile,"w") do |f|
+			        f.write JSON.pretty_generate( metadata )
+                end
 	            #exit 1
             end
             Dir.chdir( rootdir ) do

data/spec/falkorlib/git_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # git_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Mer 2014-06-25 14:36 svarrette>
+# Time-stamp: <Sam 2014-08-23 15:26 svarrette>
 #
 # @description Check the Git operations
 #
@@ -44,6 +44,11 @@ describe FalkorLib::Git do
             t.should be_true
         end
 
+		it "#remotes? -- should be false" do
+			t = FalkorLib::Git.remotes?(dir)
+			t.should be_false
+		end
+
         it "#rootdir #gitdir - checks git dir and working tree" do
             subdir = File.join(dir, 'some_dir')
             Dir.mkdir( subdir )

data/spec/falkorlib/gitflow_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # gitflow_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Jeu 2014-07-03 23:58 svarrette>
+# Time-stamp: <Mar 2014-08-26 11:15 svarrette>
 #
 # @description Check the Git Flow operations -- see https://github.com/nvie/gitflow
 #
@@ -30,9 +30,9 @@ describe FalkorLib::GitFlow do
         context "Test git-flow operations within temporary directory " do
 
             it "#init? - fails on non-git directory" do
-                t = FalkorLib::Git.init?(dir)
+                t = FalkorLib::GitFlow.init?(dir)
                 t.should be_false
-            end
+            end	
 
             it "#init - initialize a git-flow repository" do
                 STDIN.should_receive(:gets).and_return('Yes')
@@ -42,6 +42,11 @@ describe FalkorLib::GitFlow do
                 t.should be_true
             end
 
+            it "#init? - succeed on git-flow enabled directory" do
+                t = FalkorLib::GitFlow.init?(dir)
+                t.should be_true
+            end	
+
             #['feature', 'hotfix', 'support'].each do |op|
             ['feature'].each do |op|
                 name = 'toto'

data/spec/falkorlib/puppet_modules_spec.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/ruby
+#########################################
+# puppet_modules_spec.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Mar 2014-08-26 15:04 svarrette>
+#
+# @description Check the Puppet Modules operations
+#
+# Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'spec_helper'
+require 'tmpdir'
+require 'falkorlib/puppet'
+
+describe FalkorLib::Puppet::Modules do
+    include FalkorLib::Common
+
+    dir   = Dir.mktmpdir
+    #afile = File.join(dir, 'a_file')
+
+    after :all do
+        FileUtils.remove_entry_secure dir
+    end
+
+    #############################################################
+    context "Test Puppet Module creation within temporary directory " do
+
+        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)
+            templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
+            s = true
+            Dir["#{templatedir}/**/*"].each  do |e|
+                next if File.directory?(e)
+				relative_dir = Pathname.new( File.realpath( File.dirname(e) )).relative_path_from Pathname.new(templatedir)
+				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)
+				#puts "checking #{f} - #{File.exists?( f )}"
+                s &= File.exists?( f )
+            end
+            s.should be_true
+        end
+
+
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.3.0
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,6 +100,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: license-generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -249,12 +277,18 @@ files:
 - lib/falkorlib/git/flow.rb
 - lib/falkorlib/git_tasks.rb
 - lib/falkorlib/loader.rb
+- lib/falkorlib/puppet.rb
+- lib/falkorlib/puppet/base.rb
+- lib/falkorlib/puppet/modules.rb
+- lib/falkorlib/puppet_tasks.rb
 - lib/falkorlib/tasks.rb
 - lib/falkorlib/tasks/gem.rake
 - lib/falkorlib/tasks/gem.rb
 - lib/falkorlib/tasks/git.rake
 - lib/falkorlib/tasks/git.rb
 - lib/falkorlib/tasks/gitflow.rake
+- lib/falkorlib/tasks/puppet.rb
+- lib/falkorlib/tasks/puppet_modules.rake
 - lib/falkorlib/tasks/rspec.rake
 - lib/falkorlib/tasks/yard.rake
 - lib/falkorlib/version.rb
@@ -262,6 +296,7 @@ files:
 - spec/falkorlib/common_spec.rb
 - spec/falkorlib/git_spec.rb
 - spec/falkorlib/gitflow_spec.rb
+- spec/falkorlib/puppet_modules_spec.rb
 - spec/falkorlib/versioning_gem_spec.rb
 - spec/falkorlib/versioning_spec.rb
 - spec/falkorlib_spec.rb
@@ -296,6 +331,7 @@ test_files:
 - spec/falkorlib/common_spec.rb
 - spec/falkorlib/git_spec.rb
 - spec/falkorlib/gitflow_spec.rb
+- spec/falkorlib/puppet_modules_spec.rb
 - spec/falkorlib/versioning_gem_spec.rb
 - spec/falkorlib/versioning_spec.rb
 - spec/falkorlib_spec.rb