falkorlib 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e319bb2ed3e993edc52ceceb6c66fa8f24003e4
-  data.tar.gz: 3df0f1ddaa99fae1752c5071d5b59899f9541d28
+  metadata.gz: 23d6954ed4b909ec9d0d4910e1090e5550055622
+  data.tar.gz: 31936f89157d0c8a7227c286d97c6b34c73fad06
 SHA512:
-  metadata.gz: 61aa9c7a4ebe03537b4abbb6a781f4a3448b32cc88f296dc8c5df7c261895ee66270e1c63427ee2977590a7d22611c9cd2a0ac27a2808a88bbeafc305f4b27b6
-  data.tar.gz: 6793c79f88f90bb513d5e8077bcc6643006a0c595b7309727d119ca42040d8b6de575d5b4bdf036f67b8ae95a3257f0443fc16165becf316b338acf8812e19c3
+  metadata.gz: 518bfa6f7db45c4e6e365d718674d0f3c3449ded82464b95154150656bfbdb04f27b5bcca3be593cc2d0c0b39ea431de0f751fb0c688bc2cb013ff3fafe8b8f1
+  data.tar.gz: 95a6b1f26a6963df8184b84cebf315836d162a3b0210c816fd0a7bcbe3d1c0e966571fa52305e977aadc3c1ab0d69c592cc295a0dffc65dd75e22a160fc615cb

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.2.10 / Bootstrapping scipts
+
+* Enhanced setup tasks
+
+# 0.2.9 / First stable version
+
+* Management of git[flow] operations
+* Management of versioning operations
+* Flexible configuration scheme 
+
+
 # 0.1.0 / FIX ME
 
 * Enhancements

data/Gemfile.lock

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

data/README.md

@@ -4,8 +4,7 @@
 [![Build Status](https://travis-ci.org/Falkor/falkorlib.png)](https://travis-ci.org/Falkor/falkorlib)
 [![Code Climate](https://codeclimate.com/github/Falkor/falkorlib.png)](https://codeclimate.com/github/Falkor/falkorlib)
 [![Inline docs ](http://inch-ci.org/github/Falkor/falkorlib.svg)](http://inch-ci.org/github/Falkor/falkorlib)
-[![Gittip
-](http://img.shields.io/gittip/Falkor.svg)](http://gittip.com/Falkor)
+[![Gittip](http://img.shields.io/gittip/Falkor.svg)](http://gittip.com/Falkor)
 
                     _____     _ _              _     _ _
                    |  ___|_ _| | | _____  _ __| |   (_) |__
@@ -38,15 +37,19 @@ Or install it yourself as:
 
 	$> gem install falkorlib
 
-**Note** you probably wants to do the above within an isolated environment. See below for some explanation on this setup. 
+**Note** you probably wants to do the above within an isolated environment. See
+  below for some explanation on this setup.  
 
 ## Usage 
 
-This library features two aspect
+This library features two aspects
 
-* A set of toolbox functions / components I'm using everywhere in my Ruby developments, more specifically a set of modules: 
-  * `FalkorLib::Common`: Recipe for all my toolbox and versatile Ruby functions I'm using everywhere. 
-    You'll typically want to include the `FalkorLib::Common` module to bring the corresponding definitions into your scope. Example:
+* A set of toolbox functions / components I'm using everywhere in my Ruby
+  developments, more specifically a set of modules:  
+  * `FalkorLib::Common`: Recipe for all my toolbox and versatile Ruby functions
+    I'm using everywhere.  
+    You'll typically want to include the `FalkorLib::Common` module to bring the
+    corresponding definitions into your scope. Example: 
        
 			require 'falkorlib'
 			include FalkorLib::Common
@@ -67,20 +70,22 @@ This library features two aspect
         	end
   	
    	 
-  * `FalkorLib::Git`: all git operations
-  * `FalkorLib::Version`: versioning management 
+  * `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. 
 
 * 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`:
   
   		# In Rakefile
-		require "falkorlib/<object>_tasks"
+        require "falkorlib"
+        
+        ## Place-holder to customize the configuration of the <object> tasks, 
+        ## Typically by altering FalkorLib.config.<object>
+        
+		require "falkorlib/tasks/<object>" # OR require "falkorlib/<object>_tasks" 
   
-  or 
-  
-  		#In Rakefile 
-  		require "falkorlib/tasks/<object>"
-
 ### `FalkorLib` Ruby Modules / Classes Documentation
 
 [Online documentation](https://rubygems.org/gems/falkorlib) is a available. 
@@ -94,12 +99,15 @@ Statistics on the documentation generation (in particular *non*-documented compo
 
 	$> rake yard:stats 
 
-
 ### Overview of the implemented Rake tasks
 
-You can find the list of implemented Rake tasks (detailed below) in the `lib/falkorlib/*_tasks.rb` files
+You can find the list of implemented Rake tasks (detailed below) in the
+`lib/falkorlib/*_tasks.rb` files 
 
-For a given task object `<obj>` (*git* tasks for instance as proposed in `lib/falkorlib/git_tasks.rb`), you can specialize the corresponding configuration by using the block construction of `FalkorLib.config do |c| ... end` **before** requiring the task file:
+As mentioned above, for a given task object `<obj>` (*git* tasks for instance as
+proposed in `lib/falkorlib/git_tasks.rb`), you can specialize the corresponding
+configuration by using the block construction of `FalkorLib.config do |c|
+... end` **before** requiring the task file: 
 
 	# In Rakefile
 	require 'falkorlib'
@@ -114,10 +122,253 @@ For a given task object `<obj>` (*git* tasks for instance as proposed in `lib/fa
 
 ## Proposed Rake tasks
 
-
-* **Gem Management**: see `lib/falkorlib/tasks/gem.rake`
-* **Git Management**
-* ... TODO: complete list		
+FalkorLib is meant to facilitate many common operations performed within your
+projects and piloted via a
+[Rakefile](https://github.com/jimweirich/rake/blob/master/doc/rakefile.rdoc). 
+
+### Bootstrapping the project 
+
+Within your fresh new directory that will hold your project data
+(`/path/to/myproject` for instance), you'll need to bootstrap the following
+files:  
+
+* `.ruby-{version,gemset}`: [RVM](https://rvm.io/) configuration, use the name of the
+  project as [gemset](https://rvm.io/gemsets) name
+* `Gemfile`: used by `[bundle](http://bundler.io/)`, initialized with `bundle
+init` that contain _at least_ the line `gem 'falkorlib'`
+* `Gemfile.lock` will be automatically generated once you run `bundle` to
+  install the configured gems within your `Gemfile`.
+* `Rakefile`: the placeholder for your project tasks.
+
+__Assuming you are in your project directory `/path/to/myproject`__ and that RVM
+is installed on your system, you can bootstrap the above file by copy/pasting
+all the following command-lines in your terminal:  
+
+```
+bash <(curl --silent https://raw.githubusercontent.com/Falkor/falkorlib/devel/binscripts/bootstrap.sh)
+```
+_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.
+
+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`.
+
+### Git[Flow] and Versioning Management
+
+Nearly all my projects are organized under [Git](http://git-scm.com/) using the
+[gitflow](http://nvie.com/posts/a-successful-git-branching-model/) branching
+model. 
+Thus I create a flexible framework to pilot the interaction with Git, git-flow,
+git submodules, git subtrees etc. 
+
+Typical [Minimal] setup of your Rakefile, hopefully self-speaking
+
+```
+require 'falkorlib'
+
+## placeholder for custom configuration of FalkorLib.config.git and
+## FalkorLib.config.gitflow
+   
+# Git[Flow] and Versioning management
+require "falkorlib/tasks/git"    # OR require "falkorlib/git_tasks"
+```
+
+If git is not yet configured in your repository, you'll end with the following
+tasks:
+
+```
+$> rake -T
+fatal: Not a git repository (or any of the parent directories): .git
+/!\ WARNING: Git is not initialized for this directory.
+/!\ WARNING: ==> consider running 'rake git[:flow]:init' to be able to access the regular git Rake tasks
+rake falkorlib:conf  # Print the current configuration of FalkorLib
+rake git:flow:init   # Initialize Git-flow repository
+rake git:init        # Initialize Git repository
+```
+
+### Git-flow configuration
+
+Configuration aspects for git-flow are stored in the
+`FalkorLib::Config::GitFlow` module (defined in `lib/falkorlib/git/flow.rb`).
+
+* __[Default Configuration for Gitflow](http://rubydoc.info/gems/falkorlib/FalkorLib/Config/GitFlow)__
+
+You can easily customize these default settings in your Rakefile, __before__ the
+`require "falkorlib/tasks/git"` lines. Just proceed with ruby magic as follows: 
+
+```
+require 'falkorlib'
+[...]
+# Git flow customization
+FalkorLib.config.gitflow do |c|
+	c[:branches] = {
+		:master	 => 'production',
+		:develop => 'devel'
+	}
+end
+[...]
+require "falkorlib/tasks/git"
+```
+
+Now you can run `rake git:flow:init` to bootstrap your repository with git-flow.
+
+Running `rake -T` shall now raises many new tasks linked to git-flow operations: 
+
+```
+$> 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 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
+rake version:info             # Get versioning information
+rake version:release          # Finalize the release of a given bumped version
+```
+_Note_: assuming you configured `git-flow` without any `master`, you probably
+want now to delete this default branch by running `git branch -d master`
+
+So you can now:
+
+* Start/finish features with `rake git:feature:{start,finish}`
+* perform basic git operation with `rake git:{fetch,push,up}`
+* initiate semantic versioning of the project (typically with a `VERSION` file
+  at the root of your project) with `rake version:bump:{patch,minor,patch}`. 
+  Note that these tasks make use of the git flow `release` feature. 
+  
+  Concluding a release is performed by `rake version:release`
+
+### Git submodules configuration
+
+Configuration aspects for git are stored in the
+`FalkorLib::Config::Git` module (defined in `lib/falkorlib/git/base.rb`).
+
+* __[Default Configuration for Git](http://rubydoc.info/gems/falkorlib/FalkorLib/Config/Git)__
+
+In particular, you can add as many
+[Git submodules](http://git-scm.com/book/en/Git-Tools-Submodules) as you wish as
+follows: 
+
+```
+require 'falkorlib'
+[...]
+# Git customization
+FalkorLib.config.git do |c|
+	c[:submodules] = {
+		'veewee' => {
+			:url    => 'https://github.com/jedi4ever/veewee.git',
+			:branch => 'master'    # not mandatory if 'master' actually  
+		}
+	}
+end
+[...]
+require "falkorlib/tasks/git"
+```
+
+You can now bootstrap the configured sub-module(s) by running `rake
+git:submodules:init`. 
+In the above scenario, the Git sub-module `veewee` will be initiated in
+`.submodules/veewee` -- you can change the root submodules directory by altering
+`FalkorLib.config.git[:submodulesdir]` value (see [defaults](http://rubydoc.info/gems/falkorlib/FalkorLib/Config/Git)).
+
+Now you will have new rake tasks available: 
+
+      $> rake -T
+      [...]
+      rake git:submodules:init      # Initialize the Git subtrees defined in FalkorLib.config.git.submodules
+      rake git:submodules:update    # Update the git submodules from '/private/tmp/toto'
+      rake git:submodules:upgrade   # Upgrade the git submodules to the latest HEAD commit -- USE WITH CAUTION
+      [...]
+
+
+### Git subtree configuration
+
+You can also add as many
+[Git subtrees](http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/)
+as you wish -- as follows: 
+
+```
+require 'falkorlib'
+[...]
+# Git customization
+FalkorLib.config.git do |c|
+	 c[:subtrees] = {
+		 'easybuild/easyblocks' => {
+			 :url	 => 'https://github.com/ULHPC/easybuild-easyblocks.git',
+			 :branch => 'develop'
+		 },
+		 'easybuild/easyconfigs' => {
+			 :url	 => 'https://github.com/ULHPC/easybuild-easyconfigs.git',
+			 :branch => 'uni.lu'
+		 },
+     }
+end
+[...]
+require "falkorlib/tasks/git"
+```
+
+You can now bootstrap the configured sub-tree(s) by running `rake
+git:subtrees:init`. 
+In the above scenario, the Git sub-trees will be initiated in the
+sub-directories `easybuild/easyblocks` and `easybuild/easyconfigs`.
+
+Now you will have new rake tasks available: 
+
+```
+[...]
+rake git:subtrees:diff        # Show difference between local subtree(s) and their remotes
+rake git:subtrees:init        # Initialize the Git subtrees defined in FalkorLib.config.git.subtrees
+rake git:subtrees:up          # Pull the latest changes from the remote to the local subtree(s)
+[...]
+```
+
+### Gem Management
+
+See `lib/falkorlib/tasks/gem.rake`: you just have to add the following line to
+your Rakefile: 
+
+```
+require "falkorlib/tasks/gem"    # OR require "falkorlib/gem_tasks"
+```
+
+Also, you can adapt the versioning scheme to target a gem management by altering the
+[default configurations](http://rubydoc.info/gems/falkorlib/FalkorLib/Config/Versioning)
+
+```
+require "falkorlib"
+[...]
+# Adapt the versioning aspects to target a gem
+FalkorLib.config.versioning do |c|
+	c[:type] = 'gem'
+    c[:source]['gem'][:filename] = 'lib/mygem/version.rb',  # the file to patch
+end
+[...]
+require "falkorlib/tasks/git"
+require "falkorlib/tasks/gem"
+```
+
+This will bring the following tasks:
+
+```
+$> rake -T
+[...]
+rake build                    # Builds all packages
+rake clean                    # Remove any temporary products
+rake clobber                  # Remove any generated file
+rake gem:console              # Spawns an Interactive Ruby Console
+rake gem:info                 # Informations on the gem
+rake gem:release              # Release the gem
+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
+rake version:info             # Get versioning information
+rake version:release          # Finalize the release of a given bumped version
+```
 
 
 ## Implementation details
@@ -135,7 +386,18 @@ the sequel.
 
 If you use [RVM](http://beginrescueend.com/), you perhaps wants to create a
 separate gemset so that we can create and install this gem in a clean
-environment. To do that, proceed as follows:
+environment. 
+
+* create a file `.ruby-gemset` containing the name of the wished Gemset
+  (`falkorlib` for instance)
+* create a file `.ruby-version` containing the wished version of Ruby (`2.1.0`
+  for instance - check on [Travis](https://travis-ci.org/Falkor/falkorlib) for
+  the supported version)
+  
+To load these files, you have to re-enter the directory where you cloned
+`falkorlib` and placed the above files  
+
+To do that, proceed as follows:
 
     $> rvm gemset create falkorlib
     $> rvm gemset use falkorlib

data/lib/falkorlib/git/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Ven 2014-06-20 09:15 svarrette>
+# Time-stamp: <Mer 2014-06-25 14:30 svarrette>
 ################################################################################
 # Interface for the main Git operations
 #
@@ -336,6 +336,17 @@ module FalkorLib  #:nodoc:
             exit_status
         end
 
+        ## Check if the subtrees have been initialized.
+        ## Actually based on a naive check of sub-directory existence
+        def subtree_init?(path = Dir.pwd)
+	        res = true
+	        FalkorLib.config.git[:subtrees].keys.each do |dir| 
+		        res = res && File.directory?(File.join(path, dir)) 
+	        end
+	        res
+        end # subtree_init?
+
+
         ## Show difference between local subtree(s) and their remotes"
         def subtree_diff(path = Dir.pwd)
             raise ArgumentError, "Git 'subtree' command is not available" unless FalkorLib::Git.command? "subtree"

data/lib/falkorlib/git/flow.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Jeu 2014-06-19 18:14 svarrette>
+# Time-stamp: <Jeu 2014-06-26 10:45 svarrette>
 ################################################################################
 # Management of Git Flow operations
 
@@ -84,6 +84,22 @@ module FalkorLib
                 FalkorLib.config.gitflow[:prefix].each do |t,prefix|
                     exit_status = execute "git config gitflow.prefix.#{t} #{prefix}"
                 end
+		        devel_branch = FalkorLib.config.gitflow[:branches][:develop]
+		        info "Checkout to the main development branch '#{devel_branch}'"
+		        exit_status = run %{ 
+                   git checkout #{devel_branch}
+                }
+		        if branches.include?('master') && ! FalkorLib.config.gitflow[:branches].values.include?( 'master' )
+			        warn "Your git-flow confuguration does not hold the 'master' branch any more"
+			        warn "You probably want to get rid of it asap by running 'git branch -d master'"
+		        end 
+		        if devel_branch != 'master' && 
+				        remotes.include?( 'origin' ) && 
+				        branches.include?( 'remotes/origin/master')
+			        warn "You might want to change the remote default branch to point to '#{devel_branch}"
+			        puts "=> On github: Settings > Default Branch > #{devel_branch}"
+			        puts "=> On the remote bare Git repository: 'git symbolic-ref HEAD refs/head/#{devel_branch}'"
+		        end 
             end
 	        exit_status
         end

data/lib/falkorlib/git_tasks.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sam 2014-06-14 00:05 svarrette>
+# Time-stamp: <Jeu 2014-06-26 10:29 svarrette>
 ################################################################################
 #
 # FalkorLib rake tasks to pilot Git [flow] operations
@@ -42,15 +42,11 @@ else
         #.....................
         namespace :flow do
             ###########  git:flow:init   ###########
-            desc "Initialize Git-flow repository"
+            desc "Initialize the Git-flow repository"
             task :init do
                 FalkorLib::GitFlow.init
             end
         end # namespace git:flow
 
-
-
     end # namespace git
-
-
 end

data/lib/falkorlib/tasks.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Jeu 2014-06-12 16:36 svarrette>
+# Time-stamp: <Mer 2014-06-25 15:38 svarrette>
 ################################################################################
 #
 # Default FalkorLib rake tasks
@@ -21,7 +21,25 @@ namespace :falkorlib do
 	task :conf do
 		puts FalkorLib.config.to_yaml
 	end 
-end # namespace falkorlib<
+end # namespace falkorlib
+
+
+#.....................
+namespace :bundle do
+	
+	###########   init   ###########
+	desc "Initialize your Bundler configuration from your Gemfile"
+	task :init do |t|
+		info "#{t.comment}"
+		run %{ bundle }
+	end # task init 
+
+
+end # namespace bundle
+
+###########   setup   ###########
+desc "Setup the repository"
+task :setup => [ 'bundle:init' ]
 
 
 # Empty task debug 

data/lib/falkorlib/tasks/git.rake

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
 # git.rake - Special tasks for the management of Git operations
-# Time-stamp: <Jeu 2014-06-19 18:19 svarrette>
+# Time-stamp: <Jeu 2014-06-26 10:33 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -19,6 +19,7 @@ namespace :git do
     remotes = FalkorLib::Git.remotes
     #ap remotes
 
+
     ###########   git:fetch   ###########
     desc "Fetch the latest changes on remotes"
     task :fetch do |t|
@@ -32,7 +33,7 @@ namespace :git do
                       when 'up';   "Update your local copy of the repository from GIT server"
                       when 'push'; "Push your modifications onto the remote branches"
                       end
-		###########  git:{up,push}  ###########
+        ###########  git:{up,push}  ###########
         desc "#{description}"
         task op.to_sym do |t|
             info t.comment
@@ -40,30 +41,30 @@ namespace :git do
                 warn "No git remote configured... Exiting #{t}"
                 next
             end
-            cmd = ( op == 'up') ? 'pull' : op 
-			branch   = FalkorLib::Git.branch?
-			if FalkorLib::Git.list_branch.include? "remotes/origin/#{branch}"
-				status = run %{ 
+            cmd = ( op == 'up') ? 'pull' : op
+            branch   = FalkorLib::Git.branch?
+            if FalkorLib::Git.list_branch.include? "remotes/origin/#{branch}"
+                status = run %{
                       git #{cmd} origin
                 }
-				if (status.to_i != 0)
-					warn("The command '#{cmd}' failed with exit status #{status.to_i}")
-					warn("This may be due to the fact that you're not connected to the internet")
-					really_continue?('no')
-				end
-			else 
-				warn "The current branch '#{branch} is not currently tracked on the remote 'origin'."
-				warn "=> exiting"
-				next
-			end 
-        end 
+                if (status.to_i != 0)
+                    warn("The command '#{cmd}' failed with exit status #{status.to_i}")
+                    warn("This may be due to the fact that you're not connected to the internet")
+                    really_continue?('no')
+                end
+            else
+                warn "The current branch '#{branch} is not currently tracked on the remote 'origin'."
+                warn "=> exiting"
+                next
+            end
+        end
     end
 
     unless FalkorLib.config.git[:submodules].empty?
         #.....................
         namespace :submodules do
             ###########   init   ###########
-            desc "Initialize the Git subtrees defined in FalkorLib.config.git.submodules"
+            desc "Initialize the Git subtrees defined in FalkorLib.config.git[:submodules]"
             task :init do |t|
                 info t.full_comment
                 FalkorLib::Git.submodule_init(git_root_dir)
@@ -97,25 +98,28 @@ namespace :git do
         #.....................
         namespace :subtrees do
             ###########   git:subtrees:init  ###########
-            desc "Initialize the Git subtrees defined in FalkorLib.config.git.subtrees"
+            desc "Initialize the Git subtrees defined in FalkorLib.config.git[:subtrees]"
             task :init do
                 FalkorLib::Git.subtree_init(git_root_dir)
             end # task git:subtree:init
 
-            ###########   git:subtrees:diff   ###########
-            desc "Show difference between local subtree(s) and their remotes"
-            task :diff do
-                FalkorLib::Git.subtree_diff(git_root_dir)
-            end # task git:subtree:diff
-
-            ###########   git:subtrees:up   ###########
-            desc "Pull the latest changes from the remote to the local subtree(s)"
-            task :up do
-                FalkorLib::Git.subtree_up(git_root_dir)
-            end # task git:subtree:diff
-
+            if FalkorLib::Git.subtree_init?(git_root_dir)
+                ###########   git:subtrees:diff   ###########
+                desc "Show difference between local subtree(s) and their remotes"
+                task :diff do
+                    FalkorLib::Git.subtree_diff(git_root_dir)
+                end # task git:subtree:diff
+
+                ###########   git:subtrees:up   ###########
+                desc "Pull the latest changes from the remote to the local subtree(s)"
+                task :up do
+                    FalkorLib::Git.subtree_up(git_root_dir)
+                end # task git:subtree:diff
+            end
 
         end # namespace git:subtrees
     end
 
 end # namespace git
+
+task :setup => [ 'git:init' ]

data/lib/falkorlib/tasks/git.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sam 2014-06-14 00:05 svarrette>
+# Time-stamp: <Jeu 2014-06-26 10:29 svarrette>
 ################################################################################
 #
 # FalkorLib rake tasks to pilot Git [flow] operations
@@ -42,15 +42,11 @@ else
         #.....................
         namespace :flow do
             ###########  git:flow:init   ###########
-            desc "Initialize Git-flow repository"
+            desc "Initialize the Git-flow repository"
             task :init do
                 FalkorLib::GitFlow.init
             end
         end # namespace git:flow
 
-
-
     end # namespace git
-
-
 end

data/lib/falkorlib/tasks/gitflow.rake

@@ -1,6 +1,6 @@
 ################################################################################
 # gitflow.rake - Special tasks for the management of Git [Flow] operations
-# Time-stamp: <Ven 2014-06-20 14:55 svarrette>
+# Time-stamp: <Jeu 2014-06-26 10:40 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -16,12 +16,17 @@ namespace :git do
     include FalkorLib::Common
     git_root_dir = FalkorLib::Git.rootdir
 
+	###########  git:init   ###########
+	desc "Initialize Git repository"
+	task :init => [ 'git:flow:init' ]
+
     #.....................
     namespace :flow do
 
         ###########   git:flow:init   ###########
         desc "Initialize your local clone of the repository for the git-flow management"
         task :init do |t|
+			info t.comment
             FalkorLib::GitFlow.init(git_root_dir)
         end # task init
 
@@ -141,6 +146,8 @@ namespace :version do
                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)"

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, 9  
+	    MAJOR, MINOR, PATCH = 0, 2, 10  
 	    
 	    module_function
 	    

data/spec/falkorlib/git_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # git_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Ven 2014-06-20 09:15 svarrette>
+# Time-stamp: <Mer 2014-06-25 14:36 svarrette>
 #
 # @description Check the Git operations
 #
@@ -150,19 +150,31 @@ describe FalkorLib::Git do
 
 		# ---------- Subtrees ---------------
         if FalkorLib::Git.command? 'subtree'
+	        FalkorLib.config.git do |c|
+				c[:subtrees] = {
+					'falkor/lib' => {
+						:url    => 'https://github.com/Falkor/falkorlib.git',
+						:branch => 'devel'
+					},
+				}
+			end
+
+	        it "#subtree_init? -- should check that the subtree(s) have not been initialized" do
+				b = FalkorLib::Git.subtree_init?( dir )
+                b.should be_false
+			end
+
             it "#subtree_init - initialize some Git Subtrees" do
-                FalkorLib.config.git do |c|
-                    c[:subtrees] = {
-                        'falkor/lib' => {
-                            :url    => 'https://github.com/Falkor/falkorlib.git',
-                            :branch => 'devel'
-                        },
-                    }
-                end
+                
                 b = FalkorLib::Git.subtree_init( dir )
                 b.should == 0
             end
 
+	        it "#subtree_init? -- should check that the subtree(s) have been initialized" do
+				b = FalkorLib::Git.subtree_init?( dir )
+				b.should be_true
+			end
+
             it "#subtree_up" do
                 b = FalkorLib::Git.subtree_up( dir )
                 b.should == 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake