falkorlib 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809f6aba9cf7153137af45ab65e4702617e346b7
-  data.tar.gz: fe8a4009d51b091fed482c122289a47cb4d54a97
+  metadata.gz: 10b2bf279208b39dac37c3652bea3061a0c90404
+  data.tar.gz: 048f004377560479bba8d4624b7b60d6eb62166c
 SHA512:
-  metadata.gz: bfbc07e1fd264e5c1eb71a3cdb535d368cb7b618448a2cf5c8e04e3a983d7d6b92956fc0631931365d0fae74fe0fb19d5b8308686cfc0076de256df9f4aee972
-  data.tar.gz: 338cbf7fcd13a1424143b0b85a8cc3d503e05c7fb1218dbbb920917c85d5f1e5edcc0cbb496118488f4892d172c0f184b85314a3cd2c2f499dbffb45bff6e599
+  metadata.gz: 9558442aead8ca5af061f84aa741e4c5370d2bcb36ca91caf6546f200ff0bd14092c6514839994f9c97e9aa0b399c089f1aa18102aa213ed92970df64409160b
+  data.tar.gz: e48cbe39a9077e6765ef29db77bb6b1578d6ee7cc7457e6bed01efb8f9f99ed12b3e059ef4971fda96159ce59eb15805e558ab86a218aaa1a770384ff12249f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.6.11)
+    falkorlib (0.6.12)
       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: <Sun 2016-03-27 23:20 svarrette>
+# Time-stamp: <Tue 2016-06-28 18:51 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -204,7 +204,9 @@ module FalkorLib
             # ==== Gemfile ===
             gemfile = File.join(rootdir, 'Gemfile')
             unless File.exists?( gemfile )
-                run %{ bundle init }
+                # Dir.chdir(rootdir) do
+                #     run %{ bundle init }
+                # end
                 info " ==>  configuring Gemfile with Falkorlib"
                 File.open( gemfile, 'a') do |f|
                     f.puts "source 'https://rubygems.org'"
@@ -259,9 +261,9 @@ module FalkorLib
             end
             # === prepare Git submodules ===
             info " ==> prepare the relevant Git submodules"
-            submodules = {
-                          'gitstats' => { :url => 'https://github.com/hoxu/gitstats.git' }
-                         }
+            submodules = {}
+            #'gitstats' => { :url => 'https://github.com/hoxu/gitstats.git' }
+            #             }
             if options[:make]
                 submodules['Makefiles'] = {
                                            :url    => 'https://github.com/Falkor/Makefiles.git',
@@ -623,15 +625,15 @@ module FalkorLib
 
             # populate the images/ directory
             baseimages  = File.join( FalkorLib.templates, 'latex', 'images')
-            images_makefile_src = "#{FalkorLib.config[:git][:submodulesdir]}/Makefiles/generic/Makefile.insubdir"
+            #images_makefile_src = "#{FalkorLib.config[:git][:submodulesdir]}/Makefiles/generic/Makefile.insubdir"
             images = File.join(subdir, 'images')
             info "populating the image directory"
             Dir.chdir( images ) do
                 run %{ rsync -avzu #{baseimages}/ . }
                 run %{ ln -s ../.root .root } unless File.exists?(File.join(images, '.root'))
-                run %{ ln -s .root/#{images_makefile_src} Makefile } unless File.exists?(File.join(images, 'Makefile'))
+                #run %{ ln -s .root/#{images_makefile_src} Makefile } unless File.exists?(File.join(images, 'Makefile'))
             end
-
+            FalkorLib::Bootstrap::Link.makefile(images, { :src => true } )
 
             # default_project_dir = case type
             #               when :beamer

data/lib/falkorlib/bootstrap/link.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sun 2016-03-27 23:48 svarrette>
+# Time-stamp: <Sun 2016-03-27 23:58 svarrette>
 ################################################################################
 # Interface for Bootstrapping various symlinks within your project
 #
@@ -69,7 +69,7 @@ module FalkorLib
                     Dir.chdir( path ) do
                         run %{ ln -s #{dst} Makefile }
                     end
-                    ap File.join(path, 'Makefile')
+                    #ap File.join(path, 'Makefile')
                     FalkorLib::Git.add(File.join(path, 'Makefile'), "Add symlink to the #{type.capitalize} Makefile")
                 else
                     puts "  ... Makefile already setup"

data/lib/falkorlib/git/flow.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Wed 2016-02-03 00:10 svarrette>
+# Time-stamp: <Tue 2016-06-28 18:50 svarrette>
 ################################################################################
 # Management of Git Flow operations
 
@@ -43,9 +43,9 @@ module FalkorLib
         ## Check if git-flow is initialized
         # def init?(path = Dir.pwd)
 	    #     res = FalkorLib::Git.init?(path)
-	    #     Dir.chdir(path) do 
+	    #     Dir.chdir(path) do
 		#         gf_check = `git config --get-regexp 'gitflow*'`
-		#         res &= ! gf_check.empty? 
+		#         res &= ! gf_check.empty?
 	    #     end
 	    #     res
         # end # init?(path = Dir.pwd)
@@ -132,20 +132,22 @@ module FalkorLib
                 end
 		        devel_branch = gitflow_branches[:develop]
 		        #info "checkout to the main development branch '#{devel_branch}'"
-		        exit_status = run %{ 
+		        exit_status = run %{
                    git checkout #{devel_branch}
                 }
+                # git config branch.$(git rev-parse --abbrev-ref HEAD).mergeoptions --no-edit for the develop branch
+                exit_status = execute "git config branch.#{devel_branch}.mergeoptions --no-edit"
 		        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 
-		        if devel_branch != 'master' && 
-				        remotes.include?( 'origin' ) && 
+		        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
             end
 	        exit_status
         end
@@ -158,8 +160,8 @@ module FalkorLib
             error "The name '#{name}' cannot contain spaces" if name =~ /\s+/
             exit_status = 1
             Dir.chdir( FalkorLib::Git.rootdir(path) ) do
-		        exit_status = run %{ 
-                   git flow #{type} #{action} #{optional_args} #{name} 
+		        exit_status = run %{
+                   git flow #{type} #{action} #{optional_args} #{name}
                 }
             end
             exit_status
@@ -176,9 +178,9 @@ module FalkorLib
         end
 
         ###
-        # Return the Gitflow branch 
+        # Return the Gitflow branch
         # :master:   Master Branch name for production releases
-        # :develop: 
+        # :develop:
         ##
         def branches(type = :master, dir = Dir.pwd, options = {})
           FalkorLib::Git.config("gitflow.branch.#{type}", dir)

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: <Mer 2014-08-20 17:17 svarrette>
+# Time-stamp: <Tue 2016-06-28 19:00 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -60,11 +60,11 @@ namespace :git do
         end
     end
 
-    unless FalkorLib.config.git[:submodules].empty?
+    unless FalkorLib.config.git[:submodules].empty? or ! File.exists?("#{git_root_dir}/.gitmodules")
         #.....................
         namespace :submodules do
             ###########   init   ###########
-            desc "Initialize the Git subtrees defined in FalkorLib.config.git[:submodules]"
+            desc "Initialize the Git submodules (as defined in FalkorLib.config.git[:submodules] or .gitmodules)"
             task :init do |t|
                 info t.full_comment
                 FalkorLib::Git.submodule_init(git_root_dir)
@@ -123,9 +123,9 @@ namespace :git do
 end # namespace git
 
 task :setup => [ 'git:init' ]
-unless FalkorLib.config.git[:submodules].empty?
+if (! FalkorLib.config.git[:submodules].empty?) or File.exists?("#{FalkorLib::Git.rootdir}/.gitmodules")
 	task :setup => [ 'git:submodules:init' ]
-end 
+end
 unless FalkorLib.config.git[:subtrees].empty?
 	task :setup => [ 'git:subtrees:init' ]
-end 
+end

data/lib/falkorlib/tasks/rspec.rake

@@ -33,7 +33,7 @@ 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/**/bootstrap_he*spec.rb"
         #t.pattern = "spec/**/git*spec.rb"
         #t.pattern = "spec/**/error*spec.rb"
         #t.pattern = "spec/**/config*spec.rb"

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, 6, 11  
+	    MAJOR, MINOR, PATCH = 0, 6, 12  
 	    
 	    module_function
 	    

data/spec/falkorlib/bootstrap_helpers_spec.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/ruby
+#########################################
+# bootstrap_spec.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Tue 2016-06-28 18:37 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
+
+    dir = Dir.mktmpdir
+
+    before :all do
+        $stdout.sync = true
+        #FalkorLib.config[:no_interaction] = true
+    end
+
+    after :all do
+        FileUtils.remove_entry_secure dir
+        FalkorLib.config[:no_interaction] = false
+    end
+
+    context 'helper functions' do
+        it "#select_forge - none" do
+            STDIN.should_receive(:gets).and_return('1')
+            t = FalkorLib::Bootstrap.select_forge()
+            t.should == :none
+        end
+
+        it "#select_forge -- default to github" do
+            STDIN.should_receive(:gets).and_return('')
+            t = FalkorLib::Bootstrap.select_forge(:github)
+            t.should == :github
+        end
+
+        FalkorLib::Config::Bootstrap::DEFAULTS[:licenses].keys.each do |lic|
+            it "#select_licence -- default to #{lic}" do
+                STDIN.should_receive(:gets).and_return('')
+                t = FalkorLib::Bootstrap.select_licence(lic)
+                t.should == lic
+            end
+        end
+
+        ### Badges
+        it "#get_badge " do
+            subject = 'licence'
+            status  = 'GPL-2.0'
+            t = FalkorLib::Bootstrap.get_badge(subject, status)
+            t.should =~ /#{subject}/
+            t.should =~ /#{status.sub(/-/, '--')}/
+        end
+    end # context
+
+
+    ############################################
+    context 'boostrap repo' do
+        it '#repo' do
+            FalkorLib.config[:no_interaction] = true
+            FalkorLib::Bootstrap.repo(dir, { :no_interaction => true, :git_flow => false })
+            FalkorLib.config[:no_interaction] = false
+        end
+    end
+
+    ############################################
+    context 'boostrap motd' do
+        it "#motd" do
+            motdfile = File.join(dir, 'motd1')
+            FalkorLib::Bootstrap.motd(dir, { :file => "#{motdfile}", :no_interaction => true })
+            t = File.exists?(motdfile)
+            t.should be_true
+        end
+    end
+
+end

data/spec/falkorlib/bootstrap_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # bootstrap_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Dim 2015-03-29 22:28 svarrette>
+# Time-stamp: <Tue 2016-06-28 18:37 svarrette>
 #
 # @description Check the Bootstrapping operations
 #
@@ -25,16 +25,19 @@ describe FalkorLib::Bootstrap do
     }
     before :all do
         $stdout.sync = true
+        #FalkorLib.config[:no_interaction] = true
     end
 
     after :all do
         dirs.each do |t,d|
+            #next if t == :with_git
             FileUtils.remove_entry_secure d
         end
         FalkorLib.config[:no_interaction] = false
     end
 
     [ :without_git, :with_git ].each do |ctx|
+    #[ :with_git ].each do |ctx|
         dir = dirs[ctx]
         #############################################################
         context "Test bootstrapping operations within (#{ctx}) temporary directory #{dir} " do
@@ -42,13 +45,13 @@ describe FalkorLib::Bootstrap do
             if ctx == :with_git
                 it "initialize Git in the temporary directory #{dir}" do
                     c = FalkorLib::Git.init(dir)
-			        c.should == 0
+                    c.should == 0
                     t = FalkorLib::Git.init?(dir)
                     t.should be_true
                 end
             end
 
-            ######### Trash creation  #########
+            #### Trash creation  #########
             it "#trash" do
                 c = FalkorLib::Bootstrap.trash(dir)
                 t = File.exists?( File.join(dir, FalkorLib.config[:templates][:trashdir], '.gitignore'))
@@ -71,9 +74,9 @@ describe FalkorLib::Bootstrap do
 
             ######### RVM #########
             it "#rvm" do
-                gemset = 'mygemset'
-                STDIN.should_receive(:gets).and_return('1')
-                STDIN.should_receive(:gets).and_return(gemset)
+                gemset = File.basename(dir)
+                STDIN.should_receive(:gets).and_return('1') if ctx == :without_git
+                STDIN.should_receive(:gets).and_return('')  if ctx == :without_git
                 c = FalkorLib::Bootstrap.rvm(dir)
                 c.should == 0
                 content = {}
@@ -92,7 +95,7 @@ describe FalkorLib::Bootstrap do
                 c.should == 1
             end
 
-            it "#rvm -- change targets" do
+            it "#rvm -- change targets (ctx = #{ctx}; dir = #{dir})" do
                 opts = {
                     :ruby        => '1.2.3',
                     :versionfile => '.myversion',
@@ -103,43 +106,16 @@ describe FalkorLib::Bootstrap do
                 c.should == 0
                 content = {}
                 [:versionfile, :gemsetfile].each do |type|
-                    f = File.join(dir, opts[type.to_sym])
+                    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
 
-            it "#select_forge - none" do
-			    STDIN.should_receive(:gets).and_return('1')
-                t = FalkorLib::Bootstrap.select_forge()
-                t.should == :none
-            end
-
-            it "#select_forge -- default to github" do
-                STDIN.should_receive(:gets).and_return('')
-                t = FalkorLib::Bootstrap.select_forge(:github)
-                t.should == :github
-            end
-
-            FalkorLib::Config::Bootstrap::DEFAULTS[:licenses].keys.each do |lic|
-                it "#select_licence -- default to #{lic}" do
-                    STDIN.should_receive(:gets).and_return('')
-                    t = FalkorLib::Bootstrap.select_licence(lic)
-                    t.should == lic
-                end
-            end
-
-            it "#get_badge " do
-                subject = 'licence'
-                status  = 'GPL-2.0'
-                t = FalkorLib::Bootstrap.get_badge(subject, status)
-                t.should =~ /#{subject}/
-                t.should =~ /#{status.sub(/-/, '--')}/
-            end
 
+            ### README creation
             it "#readme" do
                 #Array.new(6).each { |e|  STDIN.should_receive(:gets).and_return('') }
                 #STDIN.should_receive(:gets).and_return('')
@@ -151,29 +127,24 @@ describe FalkorLib::Bootstrap do
                 FalkorLib.config[:no_interaction] = false
             end
 
-        end # context
+            ### Bootstrap a VERSION file
+            it "#versionfile" do
+                file    = 'version.txt'
+                version = '1.2.14'
+                FalkorLib.config[:no_interaction] = true
+                FalkorLib::Bootstrap.versionfile(dir,
+                                                 {
+                                                     :file    => "#{file}",
+                                                     :version => "#{version}",
+                                                     :no_interaction => true
+                                                 })
+                t = File.exists?(File.join(dir, file))
+                t.should be_true
+                v = FalkorLib::Versioning.get_version(dir, { :source => { :filename => file }})
+                v.should == "#{version}"
+            end
 
+        end # context
     end # each
-    
-    ############################################
-    context 'boostrap repo' do
-        dir = dirs[:default]
-        it '#repo' do
-            FalkorLib.config[:no_interaction] = true
-            FalkorLib::Bootstrap.repo(dir, { :no_interaction => true, :git_flow => false })
-            FalkorLib.config[:no_interaction] = false
-        end
-    end
 
-    ############################################
-    context 'boostrap motd' do
-        dir = dirs[:default]
-        it "#motd" do
-            motdfile = File.join(dir, 'motd1')
-            FalkorLib::Bootstrap.motd(dir, { :file => "#{motdfile}", :no_interaction => true })
-            t = File.exists?(motdfile)
-            t.should be_true
-        end
-    end 
-    
 end

data/spec/falkorlib/versioning_puppet_module_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # versioning_puppet_module_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Fri 2015-05-15 23:28 svarrette>
+# Time-stamp: <Tue 2016-06-28 18:51 svarrette>
 #
 # @description Check the versioning operations on Gems
 #
@@ -35,7 +35,7 @@ describe FalkorLib::Versioning::Puppet do
 		FalkorLib.config.versioning do |c|
 			c[:type] = 'puppet_module'
 		end
-	end 
+	end
 
     after :all do
 		configatron.temp_end

data/spec/spec_helper.rb

@@ -26,6 +26,25 @@ def capture(stream)
     result
 end
 
+# Credits: [nu7hatch](https://gist.github.com/nu7hatch/631329)
+module Helpers
+  # Replace standard input with faked one StringIO.
+  def fake_stdin(*args)
+    begin
+      $stdin = StringIO.new
+      $stdin.puts(args.shift) until args.empty?
+      $stdin.rewind
+      yield
+    ensure
+      $stdin = STDIN
+    end
+  end
+end
+
+RSpec.configure do |conf|
+  conf.include(Helpers)
+end
+
 # require 'minitest/autorun'
 # require 'minitest/spec'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -393,6 +393,7 @@ files:
 - lib/falkorlib/tasks/yard.rake
 - lib/falkorlib/version.rb
 - lib/falkorlib/versioning.rb
+- spec/falkorlib/bootstrap_helpers_spec.rb
 - spec/falkorlib/bootstrap_spec.rb
 - spec/falkorlib/common_spec.rb
 - spec/falkorlib/config_spec.rb
@@ -479,6 +480,7 @@ specification_version: 4
 summary: Sebastien Varrette aka Falkor's Common library to share Ruby code and {rake,cap}
   tasks
 test_files:
+- spec/falkorlib/bootstrap_helpers_spec.rb
 - spec/falkorlib/bootstrap_spec.rb
 - spec/falkorlib/common_spec.rb
 - spec/falkorlib/config_spec.rb