falkorlib 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f6ff47aab0020111d7405279aa40b72decc9f3
-  data.tar.gz: 3fde15f7cc813365b0cfabe7aa94e7d01741036c
+  metadata.gz: 5357864bd82cefc2a1c4f104374275a3ab7094c9
+  data.tar.gz: 00a2932ff2fe26c8d60b36a6573b506e8f682016
 SHA512:
-  metadata.gz: d322a5ea7a88c93e42cbd2a08099d88353ec9d4e66ff2937a163b54bd94403104e9e477634990977b19769c999de117b7e1d4fae234aaf9a1531fa839da81f93
-  data.tar.gz: e9200caafecbeb305dc5eafdc045ffc957d8d28db4f0fa98af41e219a4d8a1dae0b5f1364b7d82e317e817cd0152c33e534d7ce2016d2c911c99fdf402b00706
+  metadata.gz: 40c6b160ea3cea3ae23916c5273312805633134f4795f90c9d6c482dbde39836046196d1831e18a358e4d1bb4d37d7387fd17a470cae9138b2e873ad55fea65c
+  data.tar.gz: cef36b07f6538759a1973d1152b30349b393cb1da652ef785db092e254397098e676c2647d27b28680d563b8163664640b5055f8186625f77d83b7bace308936

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.7.15)
+    falkorlib (0.7.16)
       activesupport (~> 4.0)
       artii (>= 2.1)
       awesome_print (~> 1.2)

data/lib/falkorlib/git/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sat 2016-11-12 12:27 svarrette>
+# Time-stamp: <Thu 2018-10-04 08:07 svarrette>
 ################################################################################
 # Interface for the main Git operations
 #
@@ -156,7 +156,7 @@ module FalkorLib #:nodoc:
       if (options[:list] || (key.is_a? Regexp) || (key =~ /\*/))
         cg  = MiniGit::Capturing.new(dir)
         res = (cg.config :list => true).split("\n")
-        res.select! { |e| e.match(key) } unless key == '*'
+        res.select! { |e| e.match(/^#{key}/) } unless key == '*'
         #res = res.map { |e| e.split('=') }.to_h if options[:hash]
         res = Hash[ res.map { |e| e.split('=') } ] if options[:hash]
       else

data/lib/falkorlib/tasks/git.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Fri 2016-11-11 14:29 svarrette>
+# Time-stamp: <Wed 2018-10-03 21:57 svarrette>
 ################################################################################
 #
 # FalkorLib rake tasks to pilot Git [flow] operations
@@ -48,25 +48,15 @@ else
         FalkorLib::GitFlow.init
       end
     end # namespace git:flow
-
-    if   FalkorLib::GitFlow.init?
-      ###########  git:up   ###########
-      desc "Update your local branches"
-      task :up do |t|
-        info "#{t.comment}"
-        FalkorLib::Git.fetch
-        branches = FalkorLib::Git.list_branch
-        #puts branches.to_yaml
-        unless FalkorLib::Git.dirty?
-          FalkorLib.config.gitflow[:branches].each do |t, br|
-            info "updating Git Flow #{t} branch '#{br}' with the 'origin' remote"
-            run %{ git checkout #{br} && git merge origin/#{br} }
-          end
-          run %{ git checkout #{branches[0]} }  # Go back to the initial branch
-        else
-          warning "Unable to update -- your local repository copy is dirty"
-        end
-      end # task git:up
-    end
   end # namespace git
 end
+
+###########   up   ###########
+desc "upgrade your local branche(s)"
+task :up do |t|
+  if   FalkorLib::GitFlow.init?
+    Rake::Task['git:flow:up'].invoke
+  else
+    Rake::Task['git:up'].invoke
+  end
+end # task up

data/lib/falkorlib/tasks/gitflow.rake

@@ -1,6 +1,6 @@
 ################################################################################
 # gitflow.rake - Special tasks for the management of Git [Flow] operations
-# Time-stamp: <Fri 2016-11-11 15:43 svarrette>
+# Time-stamp: <Wed 2018-10-03 16:00 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -27,6 +27,25 @@ namespace :git do
       info t.comment
       FalkorLib::GitFlow.init(git_root_dir)
     end # task init
+
+    ###########   git:flow:up   ###########
+    desc "Update your gitflow local branches"
+    task :up do |t|
+      info "#{t.comment}"
+      FalkorLib::Git.fetch
+      branches = FalkorLib::Git.list_branch
+      #puts branches.to_yaml
+      unless FalkorLib::Git.dirty?
+        FalkorLib.config.gitflow[:branches].each do |t, br|
+          info "updating Git Flow #{t} branch '#{br}' with the 'origin' remote"
+          run %{ git checkout #{br} && git merge origin/#{br} }
+        end
+        run %{ git checkout #{branches[0]} }  # Go back to the initial branch
+      else
+        warning "Unable to update -- your local repository copy is dirty"
+      end
+    end
+
   end # namespace git::flow
 
   #.....................
@@ -103,8 +122,8 @@ namespace :version do
         if (current_branch == expected_branch)
           FalkorLib::Versioning.set_version(release_version)
           if (!FalkorLib.config[:versioning].nil?) &&
-             FalkorLib.config[:versioning][:type] == 'gem' &&
-             File.exist?(File.join(FalkorLib::Git.rootdir, 'Gemfile'))
+              FalkorLib.config[:versioning][:type] == 'gem' &&
+              File.exist?(File.join(FalkorLib::Git.rootdir, 'Gemfile'))
             info "Updating Gemfile information"
             run %(
                            # Update cache info
@@ -144,7 +163,7 @@ namespace :version do
     end
     #info "Update the changelog"
     if (!FalkorLib.config[:versioning].nil?) &&
-       FalkorLib.config[:versioning][:type] == 'gem'
+        FalkorLib.config[:versioning][:type] == 'gem'
       warn "About to push the released new gem (version #{version}) to the gem server (rybygems.org)"
       really_continue?
       Rake::Task['gem:release'].invoke

data/lib/falkorlib/tasks/rspec.rake

@@ -55,6 +55,7 @@ begin
           desc "Run all specs in #{name} spec suite"
           RSpec::Core::RakeTask.new(name.to_sym) do |t|
             t.pattern = "spec/**/#{name}_*spec.rb"
+            #t.pattern = "spec/**/git_*spec.rb"
             t.verbose = false
             t.rspec_opts = rspec_opts
           end # task #{name}

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

data/spec/falkorlib/git_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # git_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sat 2016-11-12 12:30 svarrette>
+# Time-stamp: <Thu 2018-10-04 08:05 svarrette>
 #
 # @description Check the Git operations
 #
@@ -228,11 +228,11 @@ describe FalkorLib::Git do
         end
 
         it "#config -- check pattern 2" do
-            c = FalkorLib::Git.config(/.*name=/, dir)
+            c = FalkorLib::Git.config(/user.*name*=/, dir)
             expect(c).not_to be_empty
             t = c.is_a? Array
             expect(t).to be true
-            expect(c.length).to eq(1)
+            expect(c.length).to eq(1), lambda { "expected array of size 1, got #{c.inspect}" }
         end
 
         it "#config -- return hash" do

data/templates/puppet/modules/Rakefile

@@ -37,7 +37,7 @@ end
 
 
 require 'falkorlib/tasks/git'
-#require 'falkorlib/tasks/puppet'
+require 'falkorlib/tasks/puppet'
 
 ##############################################################################
 #TOP_SRCDIR = File.expand_path(File.join(File.dirname(__FILE__), "."))

data/templates/puppet/modules/metadata.json.erb

@@ -16,7 +16,7 @@
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_requirement": ">=4.2.2 <5.0.0"
+      "version_requirement": ">=4.2.2 <6.0.0"
     }
   ],
   "operatingsystem_support": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -582,19 +582,19 @@ 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_latex_spec.rb
-- spec/falkorlib/bootstrap_link_spec.rb
-- spec/falkorlib/bootstrap_ruby_spec.rb
+- spec/spec_helper.rb
+- spec/falkorlib_spec.rb
+- spec/falkorlib/error_spec.rb
 - spec/falkorlib/bootstrap_spec.rb
-- spec/falkorlib/common_spec.rb
 - spec/falkorlib/config_spec.rb
-- spec/falkorlib/error_spec.rb
+- spec/falkorlib/bootstrap_ruby_spec.rb
+- spec/falkorlib/bootstrap_link_spec.rb
 - spec/falkorlib/git_spec.rb
 - spec/falkorlib/gitflow_spec.rb
+- spec/falkorlib/bootstrap_latex_spec.rb
+- spec/falkorlib/bootstrap_helpers_spec.rb
+- spec/falkorlib/common_spec.rb
+- spec/falkorlib/versioning_spec.rb
 - spec/falkorlib/puppet_modules_spec.rb
-- spec/falkorlib/versioning_gem_spec.rb
 - spec/falkorlib/versioning_puppet_module_spec.rb
-- spec/falkorlib/versioning_spec.rb
-- spec/falkorlib_spec.rb
-- spec/spec_helper.rb
+- spec/falkorlib/versioning_gem_spec.rb