falkorlib 0.3.14 → 0.4.0

data/lib/falkorlib/git/flow.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2014-08-26 11:57 svarrette>
+# Time-stamp: <Jeu 2015-01-22 22:51 svarrette>
 ################################################################################
 # Management of Git Flow operations
 
@@ -39,9 +39,35 @@ module FalkorLib
 
         module_function
 
+        ## OLD version
+        ## 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)
+
+        ###### init? ######
+        # Check if gitflow has been initialized
+        ##
+        def init?(dir = Dir.pwd)
+          res = FalkorLib::Git.init?(dir)
+          if res
+            res &= !FalkorLib::Git.config('gitflow*', dir).empty?
+          end
+          res
+        end # init?
+
         ## Initialize a git-flow repository
-        def init(path = Dir.pwd)
-            exit_status = FalkorLib::Git.init(path)
+        # Supported options:
+        # :interactive [boolean] confirm Gitflow branch names
+        # :master  [string] Branch name for production releases
+        # :develop [string] Branch name for development commits
+        def init(path = Dir.pwd, options = {})
+            exit_status = FalkorLib::Git.init(path, options)
             error "you shall install git-flow: see https://github.com/nvie/gitflow/wiki/Installation" unless command?('git-flow')
             remotes      = FalkorLib::Git.remotes(path)
             git_root_dir = FalkorLib::Git.rootdir( path )
@@ -50,48 +76,62 @@ module FalkorLib
 	                warn "Not yet any commit detected in this repository."
 	                readme = 'README.md'
 	                unless File.exists?( readme )
-		                answer = ask(cyan("=> initialize a commit with a #{readme} file (Y|n)?"), 'Yes')
+		                answer = ask(cyan("=> initialize a commit with an [empty] #{readme} file (Y|n)?"), 'Yes')
 		                exit 0 if answer =~ /n.*/i
 		                FileUtils.touch(readme)
-	                end 
+	                end
 	                FalkorLib::Git.add(readme, "Initiate the repository with a '#{readme}' file")
                 end
 		        branches     = FalkorLib::Git.list_branch(path)
+                gitflow_branches = FalkorLib.config.gitflow[:branches].clone
+                # correct eventually the considered branch from the options
+                gitflow_branches.each do |t,b|
+                  gitflow_branches[t] = options[t.to_sym] if options[t.to_sym]
+                  confs = FalkorLib::Git.config('gitflow*', path, :hash => true)
+                  unless confs.empty?
+                    gitflow_branches[t] = confs["gitflow.branch.#{t}"]
+                  end
+                end
+                if options[:interactive]
+                  gitflow_branches[:master]  = ask("=> branch name for production releases", gitflow_branches[:master])
+                  gitflow_branches[:develop] = ask("=> branch name for development commits", gitflow_branches[:develop])
+                end
+                ap gitflow_branches if options[:debug]
                 if remotes.include?( 'origin' )
                     info "=> configure remote (tracked) branches"
                     exit_status = FalkorLib::Git.fetch(path)
-                    FalkorLib.config.gitflow[:branches].each do |type,branch|
+                    gitflow_branches.each do |type,branch|
                         if branches.include? "remotes/origin/#{branch}"
                             exit_status = FalkorLib::Git.grab(branch, path)
                         else
                             unless branches.include? branch
-                                info "Creating the branch '#{branch}'"
+                                info "=> creating the branch '#{branch}'"
                                 FalkorLib::Git.create_branch( branch, path )
                             end
                             exit_status = FalkorLib::Git.publish(branch, path )
                         end
                     end
                 else
-                    FalkorLib.config.gitflow[:branches].each do |type, branch|
+                    gitflow_branches.each do |type, branch|
                         unless branches.include? branch
-                            info "creating the branch '#{branch}'"
+                            info " => creating the branch '#{branch}'"
                             exit_status = FalkorLib::Git.create_branch( branch, path )
                         end
                     end
                 end
-                info "Initialize git flow configs"
-                FalkorLib.config.gitflow[:branches].each do |t,branch|
+                #info "initialize git flow configs"
+                gitflow_branches.each do |t,branch|
                     exit_status = execute "git config gitflow.branch.#{t} #{branch}"
                 end
                 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}'"
+		        devel_branch = 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' )
+		        if branches.include?('master') && ! 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 
@@ -106,17 +146,6 @@ 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 = '')
             error "Invalid git-flow type '#{type}'" unless ['feature', 'release', 'hotfix', 'support'].include?(type)
@@ -142,6 +171,16 @@ module FalkorLib
             command(name, type, 'finish', path, optional_args)
         end
 
+        ###
+        # Return the Gitflow branch 
+        # :master:   Master Branch name for production releases
+        # :develop: 
+        ##
+        def branches(type = :master, dir = Dir.pwd, options = {})
+          FalkorLib::Git.config("gitflow.branch.#{type}", dir)
+          #confs[type.to_sym]
+        end # master_branch
+
 
     end # module FalkorLib::GitFlow
 

data/lib/falkorlib/loader.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-08-25 21:04 svarrette>
+# Time-stamp: <Jeu 2015-01-15 17:26 svarrette>
 ################################################################################
 # Place the component you wish to see loaded  
 
@@ -9,4 +9,4 @@ require "falkorlib/common"
 require "falkorlib/git"
 require "falkorlib/versioning"
 require "falkorlib/puppet"
-
+require "falkorlib/cli"

data/lib/falkorlib/puppet.rb

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

data/lib/falkorlib/puppet/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-08-25 21:34 svarrette>
+# Time-stamp: <Lun 2015-01-19 17:56 svarrette>
 ################################################################################
 # Interface for the main Puppet operations
 #
@@ -17,9 +17,9 @@ module FalkorLib  #:nodoc:
 		    # Puppet defaults for FalkorLib
 		    DEFAULTS = {
 			    :modulesdir => File.join(Dir.pwd, 'modules')
-		    } 
-	    end 
-    end 
+		    }
+	    end
+    end
 
     module Puppet  #:nodoc
 	    
@@ -27,4 +27,4 @@ module FalkorLib  #:nodoc:
 
 
 
-end 
+end

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-09-08 16:41 svarrette>
+# Time-stamp: <Lun 2015-01-12 22:09 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -88,7 +88,7 @@ module FalkorLib  #:nodoc:
             ##
             def init(rootdir = Dir.pwd, name = '', options = {})
                 config = {}
-                login = `whoami`.chomp
+                #login = `whoami`.chomp
                 config[:name] = name unless name.empty?
                 moduledir = name.empty? ? rootdir : File.join(rootdir, name)
                 FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata].each do |k,v|

data/lib/falkorlib/tasks/gem.rake

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
 # gem.rake - Special tasks for the management of Gem operations
-# Time-stamp: <Dim 2014-08-31 22:59 svarrette>
+# Time-stamp: <Lun 2015-01-12 21:14 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -54,13 +54,8 @@ namespace :gem do
 - Description: #{spec.description}
 eos
         end
-
-
-
     end # task info
 
-
-
 end # namespace gem
 
 # Until [Issue#13](https://github.com/postmodern/rubygems-tasks/issues/13) it solved,
@@ -72,7 +67,9 @@ Gem::Tasks::Sign::PGP.new
 
 # Enhance the build to sign the built gem
 Rake::Task['build'].enhance do
+  unless ENV['GIT_AUTHOR_NAME'].nil?
     Rake::Task["sign"].invoke if File.directory?(File.join(ENV['HOME'], '.gnupg') )
+  end
 end
 
 [ 'major', 'minor', 'patch' ].each do |level|

data/lib/falkorlib/tasks/rspec.rake

@@ -33,7 +33,9 @@ begin
         #t.pattern = "spec/**/common_*.rb"
         #t.pattern = "spec/**/versioning_*spec.rb"
         #t.pattern = "spec/**/puppet*spec.rb"
-
+        #t.pattern = "spec/**/bootstrap*spec.rb"
+        #t.pattern = "spec/**/gitf*spec.rb"
+        
         # Whether or not to fail Rake when an error occurs (typically when
         # examples fail).
         t.fail_on_error = true

data/lib/falkorlib/version.rb

@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
         # MAJOR: Defines the major version
         # MINOR: Defines the minor version
         # PATCH: Defines the patch version
-	    MAJOR, MINOR, PATCH = 0, 3, 14  
+	    MAJOR, MINOR, PATCH = 0, 4, 0  
 	    
 	    module_function
 	    
@@ -72,3 +72,4 @@ module FalkorLib #:nodoc:
     VERSION = Version.to_s
 end
 
+

data/spec/falkorlib/bootstrap_spec.rb

@@ -0,0 +1,118 @@
+#!/usr/bin/ruby
+#########################################
+# bootstrap_spec.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Jeu 2015-01-22 10:47 svarrette>
+#
+# @description Check the Bootstrapping operations
+#
+# Copyright (c) 2013 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'spec_helper'
+require 'tmpdir'
+require 'FileUtils'
+
+describe FalkorLib::Bootstrap do
+
+    include FalkorLib::Common
+
+    dirs = {
+        :without_git => Dir.mktmpdir,
+        :with_git    => Dir.mktmpdir
+    }
+
+    before :all do
+        $stdout.sync = true
+    end
+
+    after :all do
+        dirs.each do |t,d|
+            FileUtils.remove_entry_secure d
+        end
+    end
+
+    [ :without_git, :with_git ].each do |ctx|
+        dir = dirs[ctx]
+        #############################################################
+        context "Test bootstrapping operations within (#{ctx}) temporary directory #{dir} " do
+
+            if ctx == :with_git
+                it "initialize Git in the temporary directory #{dir}" do
+                    c = FalkorLib::Git.init(dir)
+			        c.should == 0
+                    t = FalkorLib::Git.init?(dir)
+                    t.should be_true
+                end
+            end
+
+            ######### Trash creation  #########
+            it "#trash" do
+                c = FalkorLib::Bootstrap.trash(dir)
+                t = File.exists?( File.join(dir, FalkorLib.config[:templates][:trashdir], '.gitignore'))
+                t.should be_true
+                c.should == 0
+            end
+
+            it "#trash - repeat on an existing trash dir" do
+                c = FalkorLib::Bootstrap.trash(dir)
+                c.should == 1
+            end
+
+            it "#trash - change target trash dir" do
+                newtrashname = 'tmp/mytrash'
+                c = FalkorLib::Bootstrap.trash(dir,newtrashname)
+                t = File.exists?( File.join(dir, newtrashname, '.gitignore'))
+                t.should be_true
+                c.should == 0
+            end
+
+            ######### RVM #########
+            it "#rvm" do
+                gemset = 'mygemset'
+                STDIN.should_receive(:gets).and_return('1')
+                STDIN.should_receive(:gets).and_return(gemset)
+                c = FalkorLib::Bootstrap.rvm(dir)
+                c.should == 0
+                content = {}
+                [:versionfile, :gemsetfile].each do |type|
+                    f = File.join(dir, FalkorLib.config[:rvm][type.to_sym])
+                    t = File.exists?(f)
+                    t.should be_true
+                    content[type.to_sym] = `cat #{f}`.chomp
+                end
+                content[:versionfile].should == FalkorLib.config[:rvm][:rubies][0]
+                content[:gemsetfile].should  == gemset
+            end
+
+            it "#rvm -- repeat" do
+                c = FalkorLib::Bootstrap.rvm(dir)
+                c.should == 1
+            end
+
+            it "#rvm -- change targets" do
+                opts = {
+                    :ruby        => '1.2.3',
+                    :versionfile => '.myversion',
+                    :gemset      => 'newgemset',
+                    :gemsetfile  => '.mygemset'
+                }
+                c = FalkorLib::Bootstrap.rvm(dir, opts)
+                c.should == 0
+                content = {}
+                [:versionfile, :gemsetfile].each do |type|
+                    f = File.join(dir, opts[type.to_sym])
+                    t = File.exists?(f)
+                    t.should be_true
+                    content[type.to_sym] = `cat #{f}`.chomp
+                end
+                content[:versionfile].should == opts[:ruby]
+                content[:gemsetfile].should  == opts[:gemset]
+            end
+
+        end # context
+
+    end # each
+
+end

data/spec/falkorlib/git_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # git_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sam 2014-08-23 15:26 svarrette>
+# Time-stamp: <Jeu 2015-01-22 15:38 svarrette>
 #
 # @description Check the Git operations
 #
@@ -39,15 +39,15 @@ describe FalkorLib::Git do
 
         it "#init - initialize a git repository" do
             c = FalkorLib::Git.init(dir)
-			c.should == 0
+            c.should == 0
             t = FalkorLib::Git.init?(dir)
             t.should be_true
         end
 
-		it "#remotes? -- should be false" do
-			t = FalkorLib::Git.remotes?(dir)
-			t.should be_false
-		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')
@@ -60,37 +60,37 @@ describe FalkorLib::Git do
             end
         end
 
-		it "#has_commits? - not yet any commits" do
-			b = FalkorLib::Git.has_commits?( dir )
-			b.should be_false
-		end
+        it "#has_commits? - not yet any commits" do
+            b = FalkorLib::Git.has_commits?( dir )
+            b.should be_false
+        end
 
         it "#branch? - check non-existing branch" do
             br = FalkorLib::Git.branch?( dir )
             br.should be_nil
         end
 
-		it "#list_files -- should not list any files" do
-			l = FalkorLib::Git.list_files( dir )
-			l.should be_empty
-		end
+        it "#list_files -- should not list any files" do
+            l = FalkorLib::Git.list_files( dir )
+            l.should be_empty
+        end
 
         it "#add - makes a first commit" do
             FileUtils.touch( afile )
             t = FalkorLib::Git.add(afile)
-			t.should == 0
+            t.should == 0
         end
 
-		it "#list_files -- should list a single files" do
-			l = FalkorLib::Git.list_files( dir )
-			l.should include 'a_file'
-		end
+        it "#list_files -- should list a single files" do
+            l = FalkorLib::Git.list_files( dir )
+            l.should include 'a_file'
+        end
 
 
-		it "#has_commits? - no some commits have been done" do
-			b = FalkorLib::Git.has_commits?( dir )
-			b.should be_true
-		end
+        it "#has_commits? - no some commits have been done" do
+            b = FalkorLib::Git.has_commits?( dir )
+            b.should be_true
+        end
 
 
         it "#branch? - check existing branch" do
@@ -113,7 +113,7 @@ describe FalkorLib::Git do
 
         default_branches.each do |br|
             it "#delete_branch #list_branch - deletes branch #{br}" do
-				FalkorLib::Git.delete_branch( br, dir) #, :force => true )
+                FalkorLib::Git.delete_branch( br, dir) #, :force => true )
                 l = FalkorLib::Git.list_branch( dir )
                 l.should_not include "#{br}"
             end
@@ -129,6 +129,50 @@ describe FalkorLib::Git do
             c.should be_true
         end
 
+        it "#config -- check existing key" do
+            c = FalkorLib::Git.config('user.name', dir)
+            c.should_not be_empty
+            t = c.is_a? String
+            t.should be_true
+        end
+
+        it "#config -- check non-existing key" do
+            c = FalkorLib::Git.config('user.nam', dir)
+            c.should be_nil
+        end
+
+        it "#config -- check all keys" do
+            c = FalkorLib::Git.config('*', dir)
+            c.should_not be_empty
+            t = c.is_a? Array
+            t.should be_true
+        end
+
+        it "#config -- check pattern" do
+            c = FalkorLib::Git.config('user*', dir)
+            c.should_not be_empty
+            t = c.is_a? Array
+            t.should be_true
+            c.length.should == 2
+        end
+
+        it "#config -- check pattern 2" do
+            c = FalkorLib::Git.config(/.*name=/, dir)
+            c.should_not be_empty
+            t = c.is_a? Array
+            t.should be_true
+            c.length.should == 1
+        end
+
+        it "#config -- return hash" do
+            c = FalkorLib::Git.config('user*', dir, :hash => true)
+            c.should_not be_empty
+            t = c.is_a? Hash
+            t.should be_true
+            c.keys.length.should == 2
+        end
+
+
         # ---------- Submodules ---------------
         it "#submodules_init" do
             FalkorLib.config.git do |c|
@@ -153,32 +197,32 @@ describe FalkorLib::Git do
             b.should == 0
         end
 
-		# ---------- Subtrees ---------------
+        # ---------- 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 )
+            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
+            end
 
             it "#subtree_init - initialize some Git Subtrees" do
-                
+
                 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_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 )
@@ -197,7 +241,7 @@ describe FalkorLib::Git do
 
         # shall be the last check
         it "#dirty? - check dirty git directory" do
-          execute "echo 'toto' > #{afile}"
+            execute "echo 'toto' > #{afile}"
             b = FalkorLib::Git.dirty?( dir )
             b.should be_true
         end