falkorlib 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b688866a7028d56fb245d36207f12b727484ed
-  data.tar.gz: 3ceb29d135eeb2f9273fb51bd5c9efd560897337
+  metadata.gz: 98c462c237a49684f2aebb25a3ead3f6a83c1ed6
+  data.tar.gz: c8c24c9e37728bfdf99f1fbcb51f7d87ccbe7e64
 SHA512:
-  metadata.gz: 9dab597ad919ab7b58606cd89d295f463a7a3c05e4e132cdebea876bed110286ce640c21d63acf0a3f01084c29419c02ec638fdee859cc00fe43fd23171d0611
-  data.tar.gz: b330a6ec0382afd5035005a95caa940a2a0a4440b67409d35312edf6181b549afa0de3a7aff6717b17431174ada84b8b50ed783d290e0b0365837ced27d67328
+  metadata.gz: 36126336adf06eef2be266a4e07ef8fbe6a872a6bc90af032a4f17d90908a89ab75234288c9e78be45acf69e41b9b9df6b9f0e423824bed22198bc2c87e2c6b8
+  data.tar.gz: 91587779a881a63bb07e16c4c093de1ff6eb6b3f036d38e2eca0869f6b4e8b9ff89ea623cb1f2741535ef784706a88ffd7ad4f6a4b3c7b0d2c43f4c7be338039

data/.travis.yml

@@ -3,7 +3,7 @@ cache: bundler
 bundler_args: "--without=release doc"
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y git-flow git-core
+  - sudo apt-get install -qq git-flow git-core
 rvm:
  - 1.9.2
  - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.4.3)
+    falkorlib (0.4.4)
       artii (>= 2.1)
       awesome_print (~> 1.2)
       configatron (~> 3.2)

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mer 2015-02-25 00:02 svarrette>
+# Time-stamp: <Lun 2015-03-09 17:07 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -182,33 +182,39 @@ module FalkorLib
         # Initialize a Git repository for a project with my favorite layout
         # Supported options:
         # * :no_interaction [boolean]: do not interact
-        # :interactive [boolean] Confirm Gitflow branch names
-        # :master      [string]  Branch name for production releases
-        # :develop     [string]  Branch name for development commits
-        # :make        [boolean] Use a Makefile to pilot the repository actions
-        # :rake        [boolean] Use a Rakefile (and FalkorLib) to pilot the repository action
-        # :remote_sync [boolean] Operate a git remote synchronization
-        # :latex       [boolean] Initiate a LaTeX project
-        # :gem         [boolean] Initiate a Ruby gem project
-        # :rvm         [boolean] Initiate a RVM-based Ruby project
-        # :pyenv       [boolean] Initiate a pyenv-based Python project
-        # :octopress   [boolean] Initiate an Octopress web site
+        # * :gitflow     [boolean]: bootstrap with git-flow
+        # * :interactive [boolean] Confirm Gitflow branch names
+        # * :master      [string]  Branch name for production releases
+        # * :develop     [string]  Branch name for development commits
+        # * :make        [boolean] Use a Makefile to pilot the repository actions
+        # * :rake        [boolean] Use a Rakefile (and FalkorLib) to pilot the repository action
+        # * :remote_sync [boolean] Operate a git remote synchronization
+        # * :latex       [boolean] Initiate a LaTeX project
+        # * :gem         [boolean] Initiate a Ruby gem project
+        # * :rvm         [boolean] Initiate a RVM-based Ruby project
+        # * :pyenv       [boolean] Initiate a pyenv-based Python project
+        # * :octopress   [boolean] Initiate an Octopress web site
         ##
         def repo(name, options = {})
             ap options if options[:debug]
             path    = normalized_path(name)
             project = File.basename(path)
             use_git = FalkorLib::Git.init?(path)
+            options[:make] = false if options[:rake]
             info "Bootstrap a [Git] repository for the project '#{project}'"
             if use_git
                 warning "Git is already initialized for the repository '#{name}'"
                 really_continue? unless options[:force]
             end
-            info " ==> initialize Git flow in #{path}"
-            FalkorLib::GitFlow.init(path, options)
-            gitflow_branches = {}
-            [ :master, :develop ].each do |t|
-                gitflow_branches[t.to_sym] = FalkorLib::GitFlow.branches(t, path)
+            if options[:git_flow]
+                info " ==> initialize Git flow in #{path}"
+                FalkorLib::GitFlow.init(path, options)
+                gitflow_branches = {}
+                [ :master, :develop ].each do |t|
+                    gitflow_branches[t.to_sym] = FalkorLib::GitFlow.branches(t, path)
+                end
+            else
+                FalkorLib::Git.init(path, options)
             end
             # === prepare Git submodules ===
             info " ==> prepare the relevant Git submodules"
@@ -245,12 +251,23 @@ module FalkorLib
                 end
             end
             if options[:rake]
-                warning "TODO: setup Rakefile"
+                info " ==> prepare Root Rakefile"
+                rakefile = File.join(path, "Rakefile")
+                unless File.exist?( rakefile )
+                    templatedir = File.join( FalkorLib.templates, 'Rakefile')
+                    erbfiles = [ 'header_rakefile.erb' ]
+                    erbfiles << 'rakefile_gitflow.erb' if FalkorLib::GitFlow.init?(path)
+                    erbfiles << 'footer_rakefile.erb'
+                    write_from_erb_template(erbfiles, rakefile, {}, { :srcdir => "#{templatedir}" })
+                end
             end
 
             # === VERSION file ===
             FalkorLib::Bootstrap.versionfile(path, :tag => 'v0.0.0')
 
+            # === RVM ====
+            FalkorLib::Bootstrap.rvm(path, options) if options[:rvm]
+
             # === README ===
             FalkorLib::Bootstrap.readme(path, options)
 
@@ -365,7 +382,7 @@ module FalkorLib
                 #next unless [ :name, :summary, :description ].include?(k.to_sym)
                 default_answer = case k
                                  when :description
-                                     config[:description].empty? ? "#{config[:summary]}" : "#{config[:description]}" 
+                                     config[:description].empty? ? "#{config[:summary]}" : "#{config[:description]}"
                                  when :source
                                      config[:source].empty? ? default_source : "#{config[:source]}"
                                  when :project_page
@@ -375,7 +392,7 @@ module FalkorLib
                                  else
                                      config[k.to_sym].empty? ? v : config[k.to_sym]
                                  end
-                 config[k.to_sym] = ask( "\t" + sprintf("Project %-20s", "#{k}"), default_answer)
+                config[k.to_sym] = ask( "\t" + sprintf("Project %-20s", "#{k}"), default_answer)
             end
             tags = ask("\tKeywords (comma-separated list of tags)", config[:tags].join(','))
             config[:tags]    = tags.split(',')
@@ -448,7 +465,7 @@ module FalkorLib
         # Return a Markdown-formatted string for a badge to display, typically in a README.
         # Based on http://shields.io/
         # Supported options:
-        #  * :style [string] style of the badge, Elligible: ['plastic', 'flat', 'flat-square'] 
+        #  * :style [string] style of the badge, Elligible: ['plastic', 'flat', 'flat-square']
         ##
         def get_badge(subject, status, color = 'blue', options = {})
             st = status.gsub(/-/, '--').gsub(/_/, '__')

data/lib/falkorlib/cli.rb

@@ -1,15 +1,17 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-02-24 11:04 svarrette>
+# Time-stamp: <Lun 2015-03-09 11:57 svarrette>
 ################################################################################
 # Interface for the CLI
 #
 
 require 'thor'
 require 'thor/actions'
+require 'thor/group'
 require "falkorlib"
 
 require "falkorlib/cli/new"
+require "falkorlib/cli/link"
 
 
 
@@ -37,14 +39,21 @@ module FalkorLib
       class_option :dry_run, :aliases => '-n', :type => :boolean
 
       ###### commands ######
-      desc "commands", "Lists all available commands", :hide => true
-      def commands
-        puts App.all_commands.keys - ["commands", "completions"]
-      end
+      # desc "commands", "Lists all available commands", :hide => true
+      # def commands
+      #   puts App.all_commands.keys - ["commands", "completions"]
+      # end
 
       ###### config ######
-      desc "config", "Print the current configuration of FalkorLib" #, :hide => true
-      def config
+      desc "config [option] [KEY]", "Print the current configuration of FalkorLib" #, :hide => true
+      long_desc <<-CONFIG_LONG_DESC
+This command allows you to interact with FalkorLib's configuration system.
+FalkorLib retrieves its configuration from the local repository (in '<git_rootdir>/.falkor/config'),
+environment variables (NOT YET IMPLEMENTED), and the user's home directory (~/.falkor/config), in that order of priority.
+CONFIG_LONG_DESC
+      method_option :global, :aliases => '-g', :type => :boolean, :desc => 'Operate on the global configuration (in ~/.falkor/config)'
+      method_option :local,  :aliases => '-l', :type => :boolean, :desc => 'Operate on the local configuration of the repository (in <git_rootdir>/.falkor/config)'
+      def config(key = '')
         info "Thor options:"
         puts options.to_yaml
         info "FalkorLib internal configuration:"
@@ -54,10 +63,13 @@ module FalkorLib
 
       # map %w[--help -h] => :help
 
-      ###### init ######
-      desc "new TYPE", "Initialize the directory PATH with FalkorLib's template(s)"
+      ###### new ######
+      desc "new <type> [<path>]", "Initialize the directory PATH with FalkorLib's template(s)"
       subcommand "new", FalkorLib::CLI::New
 
+      ###### link  ######
+      desc "link <type> [<path>]", "Initialize a special symlink in <path> (the current directory by default)"
+      subcommand "link", FalkorLib::CLI::Link
 
 
       map %w[--version -V] => :version

data/lib/falkorlib/cli/config.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-02-24 11:04 svarrette>
+# Time-stamp: <Ven 2015-02-27 20:59 svarrette>
 ################################################################################
 # Management of the configuration specializations
 #
@@ -13,6 +13,7 @@ module FalkorLib
         class Config #< ::Thor
             
 
+            
 
 
             

data/lib/falkorlib/cli/link.rb

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Lun 2015-03-09 12:03 svarrette>
+################################################################################
+
+require 'thor'
+require 'falkorlib'
+#require 'falkorlib/cli/init/repo'
+#require "falkorlib/bootstrap"
+
+module FalkorLib
+    module CLI
+
+        # Thor class for symlink creation
+        class Link < ::Thor
+
+            include FalkorLib::Common
+
+            ###### rootdir (root beeing reserved) ######
+            method_option :name, :aliases => ['--target', '-t', '-n'], :default => '.root', :desc => "Name of the symlink"
+            #......................................
+            desc "rootdir [options]", "Create a symlink '.root' which targets the root of the repository"
+            def rootdir(dir = Dir.pwd)
+                raise FalkorLib::ExecError "Not used in a Git repository" unless FalkorLib::Git.init?
+                path  = normalized_path(dir)
+                relative_path_to_root = Pathname.new( FalkorLib::Git.rootdir(dir) ).relative_path_from Pathname.new( File.realpath(path))
+                FalkorLib::Common.error "Already at the root directory of the Git repository" if "#{relative_path_to_root}" == "."
+                target = options[:name] ? options[:name] : '.root'
+                unless File.exists?( File.join(path, target))
+                    warning "creating the symboling link '#{target}' which points to '#{relative_path_to_root}'" if options[:verbose]
+                    # Format: ln_s(old, new, options = {}) -- Creates a symbolic link new which points to old.
+                     FileUtils.ln_s "#{relative_path_to_root}", "#{target}"
+                end
+            end # rootdir
+
+            
+
+
+
+        end # class Link
+    end # module CLI
+end # module FalkorLib

data/lib/falkorlib/cli/new.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mer 2015-02-25 00:05 svarrette>
+# Time-stamp: <Lun 2015-03-09 12:09 svarrette>
 ################################################################################
 
 require 'thor'
@@ -9,14 +9,23 @@ require 'falkorlib'
 require "falkorlib/bootstrap"
 
 module FalkorLib
-  module CLI
+    module CLI
 
-    # Thor class for all bootstrapping / initialization
-    class New < ::Thor
+        # Thor class for all bootstrapping / initialization
+        class New < ::Thor
 
-      ###### repo ######
-      desc "repo NAME [options]", "Bootstrap a Git Repository"
-      long_desc <<-REPO_LONG_DESC
+
+            #map %w[--help -h] => :help
+            
+            ###### commands ######
+            # desc "commands", "Lists available commands" #, :hide => true
+            # def commands
+            #     puts App.all_commands.to_yaml #.keys - ["commands", "completions"]
+            # end
+
+            ###### repo ######
+            desc "repo NAME [options]", "Bootstrap a Git Repository"
+            long_desc <<-REPO_LONG_DESC
 Initiate a Git repository according to my classical layout.
 \x5 * the repository will be configured according to the guidelines of [Git Flow]
 \x5 * the high-level operations will be piloted either by a Makefile (default) or a Rakefile
@@ -24,91 +33,92 @@ Initiate a Git repository according to my classical layout.
 By default, NAME is '.' meaning that the repository will be initialized in the current directory.
 \x5Otherwise, the NAME subdirectory will be created and bootstraped accordingly.
       REPO_LONG_DESC
-      #......................................................
-      method_option :make, :default => true,
-        :type => :boolean, :desc => 'Use a Makefile to pilot the repository actions'
-      method_option :rake,
-        :type => :boolean, :desc => 'Use a Rakefile (and FalkorLib) to pilot the repository actions'
-      method_option :interactive, :aliases => '-i',
-        :type => :boolean, :desc => "Interactive mode"
-      method_option :remote_sync, :aliases => '-r',
-        :type => :boolean, :desc => "Operate a git remote synchronization with remote. By default, all commits stay local"
-      method_option :master, 
-        :default => 'production', :banner => 'BRANCH', :desc => "Master Branch name for production releases"
-      method_option :develop, :aliases => [ '-b', '--branch', '--devel'],
-        :default => 'devel', :banner => 'BRANCH', :desc => "Branch name for development commits"
-      method_option :latex, :aliases => '-l', :type => :boolean, :desc => "Initiate a LaTeX project"
-      method_option :gem,   :type => :boolean, :desc => "Initiate a Ruby gem project"
-      method_option :rvm,   :type => :boolean, :desc => "Initiate a RVM-based Ruby project"
-      method_option :pyenv, :type => :boolean, :desc => "Initiate a pyenv-based Python project"
-      method_option :octopress, :aliases => ['-o', '--www'], :type => :boolean, :desc => "Initiate an Octopress web site"
-      #___________________
-      def repo(name = '.')
-       # _newrepo(name, options)
-        FalkorLib::Bootstrap.repo(name, options)
-      end # repo
+            #......................................................
+            method_option :git_flow, :default => true, :type => :boolean, :desc => 'Bootstrap the repository with Git-glow'
+            method_option :make, :default => true,     :type => :boolean, :desc => 'Use a Makefile to pilot the repository actions'
+            method_option :rake,       :type => :boolean, :desc => 'Use a Rakefile (and FalkorLib) to pilot the repository actions'
+            method_option :interactive, :aliases => '-i', :default => true,
+              :type => :boolean, :desc => "Interactive mode, in particular to confirm Gitflow branch names"
+            method_option :remote_sync, :aliases => '-r',
+              :type => :boolean, :desc => "Operate a git remote synchronization with remote. By default, all commits stay local"
+            method_option :master, :default => 'production', :banner => 'BRANCH', :desc => "Master Branch name for production releases"
+            method_option :develop, :aliases => [ '-b', '--branch', '--devel'],
+              :default => 'devel', :banner => 'BRANCH', :desc => "Branch name for development commits"
+            method_option :latex, :aliases => '-l', :type => :boolean, :desc => "Initiate a LaTeX project"
+            #method_option :gem,   :type => :boolean, :desc => "Initiate a Ruby gem project"
+            method_option :rvm,   :type => :boolean, :desc => "Initiate a RVM-based Ruby project"
+            method_option :ruby, :default => '1.9.3', :desc => "Ruby version to configure for RVM"
+            #method_option :pyenv, :type => :boolean, :desc => "Initiate a pyenv-based Python project"
+            #method_option :octopress, :aliases => ['-o', '--www'], :type => :boolean, :desc => "Initiate an Octopress web site"
+            #___________________
+            def repo(name = '.')
+                options[:rvm] = true if options[:rake] or options[:gem]
+                # _newrepo(name, options)
+                FalkorLib::Bootstrap.repo(name, options)
+            end # repo
 
 
-      ###### trash ######
-      desc "trash PATH", "Add a Trash directory"
-      #________________________
-      def trash(path = Dir.pwd)
-        FalkorLib::Bootstrap.trash(path)
-      end # trash
+            ###### trash ######
+            desc "trash PATH", "Add a Trash directory"
+            #________________________
+            def trash(path = Dir.pwd)
+                FalkorLib::Bootstrap.trash(path)
+            end # trash
 
-      ###### rvm ######
-      desc "rvm PATH [options]", "Initialize RVM"
-      long_desc <<-RVM_LONG_DESC
+            ###### rvm ######
+            desc "rvm PATH [options]", "Initialize RVM"
+            long_desc <<-RVM_LONG_DESC
 Initialize Ruby Version Manager (RVM) for the current directory (or at the root directory of the Git repository).
 It consists of two files:
 \x5 * `.ruby-version`: Project file hosting a single line for the ruby version
 \x5 * `.ruby-gemset`:  Gemset file hosting a single line for the gemset to use for this project
 
 These files will be committed in Git to ensure a consistent environment for the project.
-      RVM_LONG_DESC
-      method_option :force, :aliases => '-f',
-        :type => :boolean, :desc => 'Force overwritting the RVM config'
-      method_option :ruby, :banner => 'VERSION',
-        :desc => 'Ruby version to configure / install for RVM'
-      method_option :versionfile, :banner => 'FILE',
-        :default => FalkorLib.config[:rvm][:versionfile], :desc => 'RVM ruby version file'
-      method_option :gemset, :desc => 'RVM gemset to configure for this directory'
-      method_option :gemsetfile, :banner => 'FILE',
-        :default => FalkorLib.config[:rvm][:gemsetfile], :desc => 'RVM gemset file'
-      #____________________
-      def rvm(path = '.')
-        FalkorLib::Bootstrap.rvm(path, options)
-      end # rvm
+RVM_LONG_DESC
+            method_option :force, :aliases => '-f',
+              :type => :boolean, :desc => 'Force overwritting the RVM config'
+            method_option :ruby, :banner => 'VERSION',
+              :desc => 'Ruby version to configure / install for RVM'
+            method_option :versionfile, :banner => 'FILE',
+              :default => FalkorLib.config[:rvm][:versionfile], :desc => 'RVM ruby version file'
+            method_option :gemset, :desc => 'RVM gemset to configure for this directory'
+            method_option :gemsetfile, :banner => 'FILE',
+              :default => FalkorLib.config[:rvm][:gemsetfile], :desc => 'RVM gemset file'
+            #____________________
+            def rvm(path = '.')
+                FalkorLib::Bootstrap.rvm(path, options)
+            end # rvm
 
-      ###### versionfile ######
-      desc "versionfile PATH [options]", "initiate a VERSION file"
-      method_option :file, :aliases => '-f',
-        :desc => "Set the VERSION filename"
-      method_option :tag,  :aliases => '-t',
-        :desc => "Git tag to use"
-      method_option :version,  :aliases => '-v',
-        :desc => "Set the version to initialize in the version file"
-      #_______________
-      def versionfile(path = '.')
-          FalkorLib::Bootstrap.versionfile(path, options)
-      end # versionfile
+            ###### versionfile ######
+            desc "versionfile PATH [options]", "initiate a VERSION file"
+            method_option :file, :aliases => '-f',
+              :desc => "Set the VERSION filename"
+            method_option :tag,  :aliases => '-t',
+              :desc => "Git tag to use"
+            method_option :version,  :aliases => '-v',
+              :desc => "Set the version to initialize in the version file"
+            #_______________
+            def versionfile(path = '.')
+                FalkorLib::Bootstrap.versionfile(path, options)
+            end # versionfile
 
 
-      ###### readme ######
-      method_option :make, :default => true,
-        :type => :boolean, :desc => 'Use a Makefile to pilot the repository actions'
-      method_option :rake,
-        :type => :boolean, :desc => 'Use a Rakefile (and FalkorLib) to pilot the repository actions'
-      method_option :latex, :aliases => '-l', :type => :boolean, :desc => "Describe a LaTeX project"
-      method_option :gem,   :type => :boolean, :desc => "Describe a Ruby gem project"
-      method_option :rvm,   :type => :boolean, :desc => "Describe a RVM-based Ruby project"
-      method_option :pyenv, :type => :boolean, :desc => "Describe a pyenv-based Python project"
-      method_option :octopress, :aliases => '--www', :type => :boolean, :desc => "Describe an Octopress web site"
-      #......................................
-      desc "readme PATH [options]", "Initiate a README file in the PATH directory ('./' by default)"
-      def readme(path = '.')
-          FalkorLib::Bootstrap.readme(path, options)
-      end # readme
-    end # class Init
-  end # module CLI
+            ###### readme ######
+            method_option :make, :default => true,
+              :type => :boolean, :desc => 'Use a Makefile to pilot the repository actions'
+            method_option :rake,
+              :type => :boolean, :desc => 'Use a Rakefile (and FalkorLib) to pilot the repository actions'
+            method_option :latex, :aliases => '-l', :type => :boolean, :desc => "Describe a LaTeX project"
+            method_option :gem,   :type => :boolean, :desc => "Describe a Ruby gem project"
+            method_option :rvm,   :type => :boolean, :desc => "Describe a RVM-based Ruby project"
+            method_option :pyenv, :type => :boolean, :desc => "Describe a pyenv-based Python project"
+            method_option :octopress, :aliases => '--www', :type => :boolean, :desc => "Describe an Octopress web site"
+            #......................................
+            desc "readme PATH [options]", "Initiate a README file in the PATH directory ('./' by default)"
+            def readme(path = '.')
+                FalkorLib::Bootstrap.readme(path, options)
+            end # readme
+            
+        end # class New
+    end # module CLI
 end # module FalkorLib

data/lib/falkorlib/common.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-02-24 23:50 svarrette>
+# Time-stamp: <Lun 2015-03-09 17:02 svarrette>
 ################################################################################
 
 require "falkorlib"
@@ -335,14 +335,26 @@ module FalkorLib #:nodoc:
         # ERB generation of the file `outfile` using the source template file `erbfile`
         # Supported options:
         #   :no_interaction [boolean]: do not interact
+        #   :srcdir         [string]: source dir for all considered ERB files
         def write_from_erb_template(erbfile, outfile, config = {},
                                     options = {
-                                               :no_interaction => false
+                                               :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)
+            erbfiles = erbfile.is_a?(Array) ? erbfile : [ erbfile ]
+            content = ""
+            erbfiles.each do |f|
+                erb = options[:srcdir].nil? ? f : File.join(options[:srcdir], f)
+                unless File.exists? (erb)
+                    warning "Unable to find the template ERBfile '#{erb}'"
+                    really_continue? unless options[:no_interaction]
+                    next
+                end 
+                content += ERB.new(File.read("#{erb}"), nil, '<>').result(binding)
+            end
+            # 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)
             show_diff_and_write(content, outfile, options)
         end
 

data/lib/falkorlib/config.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mer 2015-02-25 00:19 svarrette>
+# Time-stamp: <Lun 2015-03-09 12:02 svarrette>
 ################################################################################
 # FalkorLib Configuration
 #
@@ -123,7 +123,8 @@ module FalkorLib #:nodoc:
             conffile = config_file(dir,type,options)
             confdir  = File.dirname( conffile )
             unless File.directory?( confdir )
-                really_continue? "about to create the configuration directory #{confdir}" unless options[:no_interaction]
+                warning "about to create the configuration directory #{confdir}"
+                really_continue?  unless options[:no_interaction]
                 run %{ mkdir -p #{confdir} }
             end
             store_config(conffile, config, options)

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, 4, 3  
+	    MAJOR, MINOR, PATCH = 0, 4, 4  
 	    
 	    module_function
 	    

data/spec/falkorlib/bootstrap_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # bootstrap_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Mer 2015-02-25 00:03 svarrette>
+# Time-stamp: <Lun 2015-03-09 17:09 svarrette>
 #
 # @description Check the Bootstrapping operations
 #
@@ -160,7 +160,7 @@ describe FalkorLib::Bootstrap do
         
         it '#repo' do
             FalkorLib.config[:no_interaction] = true
-            FalkorLib::Bootstrap.repo(dir, { :no_interaction => true })
+            FalkorLib::Bootstrap.repo(dir, { :no_interaction => true, :git_flow => false })
             FalkorLib.config[:no_interaction] = false
         end
 

data/templates/Rakefile/footer_rakefile.erb

@@ -0,0 +1,2 @@
+
+require 'falkorlib/tasks/git'

data/templates/Rakefile/header_rakefile.erb

@@ -0,0 +1,21 @@
+##############################################################################
+# Rakefile - Configuration file for rake (http://rake.rubyforge.org/)
+# Time-stamp: <Lun 2015-03-09 16:53 svarrette>
+#
+# Copyright (c) <%= Time.now.year %> <%= ENV['GIT_AUTHOR_NAME'] %> <<%= ENV['GIT_AUTHOR_EMAIL'] %>>
+#                       ____       _         __ _ _
+#                      |  _ \ __ _| | _____ / _(_) | ___
+#                      | |_) / _` | |/ / _ \ |_| | |/ _ \
+#                      |  _ < (_| |   <  __/  _| | |  __/
+#                      |_| \_\__,_|_|\_\___|_| |_|_|\___|
+#
+# Use 'rake -T' to list the available actions
+#
+# Resources:
+# * http://www.stuartellis.eu/articles/rake/
+##############################################################################
+require 'falkorlib'
+
+## placeholder for custom configuration of FalkorLib.config.*
+## See https://github.com/Falkor/falkorlib
+

data/templates/Rakefile/rakefile_gitflow.erb

@@ -0,0 +1,8 @@
+
+# Git flow customization
+FalkorLib.config.gitflow do |c|
+    c[:branches] = {
+        :master  => '<%= FalkorLib::GitFlow.branches(:master) %>',
+        :develop => '<%= FalkorLib::GitFlow.branches(:develop) %>'
+    }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -351,6 +351,7 @@ files:
 - lib/falkorlib/bootstrap/base.rb
 - lib/falkorlib/cli.rb
 - lib/falkorlib/cli/config.rb
+- lib/falkorlib/cli/link.rb
 - lib/falkorlib/cli/new.rb
 - lib/falkorlib/common.rb
 - lib/falkorlib/config.rb
@@ -396,6 +397,9 @@ files:
 - templates/README/readme_gitflow.erb
 - templates/README/readme_latex.erb
 - templates/README/readme_rvm.erb
+- templates/Rakefile/footer_rakefile.erb
+- templates/Rakefile/header_rakefile.erb
+- templates/Rakefile/rakefile_gitflow.erb
 - templates/puppet/modules/.gitignore
 - templates/puppet/modules/.vagrant_init.rb
 - templates/puppet/modules/Gemfile