falkorlib 0.6.19 → 0.7.0

data/lib/falkorlib/puppet_tasks.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-08-25 21:46 svarrette>
+# Time-stamp: <Fri 2016-11-11 14:45 svarrette>
 ################################################################################
 #
 # FalkorLib rake tasks to pilot Puppet operations
@@ -11,14 +11,17 @@ require 'falkorlib'
 require 'falkorlib/tasks'
 
 module FalkorLib #:nodoc:
-	class PuppetTasks
-		include Rake::DSL if defined? Rake::DSL
+  # Puppet tasks for Rake
+  class PuppetTasks
 
-		# Install the puppet tasks for Rake
-        def install_tasks
-            load 'falkorlib/tasks/puppet_modules.rake'
-        end
-	end
+    include Rake::DSL if defined? Rake::DSL
+
+    # Install the puppet tasks for Rake
+    def install_tasks
+      load 'falkorlib/tasks/puppet_modules.rake'
+    end
+
+  end
 end
 
 FalkorLib::PuppetTasks.new.install_tasks

data/lib/falkorlib/tasks.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Tue 2015-05-19 17:59 svarrette>
+# Time-stamp: <Tue 2016-11-08 23:50 svarrette>
 ################################################################################
 #
 # Default FalkorLib rake tasks
@@ -16,66 +16,64 @@ FalkorLib.config.debug = ARGV.include?('DEBUG')
 
 #.....................
 namespace :falkorlib do
-	###########  falkorlib:conf   ###########
-	desc "Print the current configuration of FalkorLib"
-	task :conf do
-		puts FalkorLib.config.to_yaml
-	end
+  ###########  falkorlib:conf   ###########
+  desc "Print the current configuration of FalkorLib"
+  task :conf do
+    puts FalkorLib.config.to_yaml
+  end
 
-    ###########  falkorlib:upgrade   ###########
-    desc "Upgrade FalkorLib to the latest version using Bundle"
-    task :upgrade do |t|
-        info "#{t.comment}"
-        error "Unable to find the 'bundle' command" unless command?('bundle')
-        run %{ bundle update falkorlib }
-        if FalkorLib::Git.init?
-            gemfile_lock = File.join(FalkorLib::Git.rootdir, 'Gemfile.lock')
-            run %{git commit -s -m "Upgrade FalkorLib to the latest version" #{gemfile_lock} } if File.exist?(gemfile_lock)
-        end
+  ###########  falkorlib:upgrade   ###########
+  desc "Upgrade FalkorLib to the latest version using Bundle"
+  task :upgrade do |t|
+    info(t.comment).to_s
+    error "Unable to find the 'bundle' command" unless command?('bundle')
+    run %( bundle update falkorlib )
+    if FalkorLib::Git.init?
+      gemfile_lock = File.join(FalkorLib::Git.rootdir, 'Gemfile.lock')
+      run %(git commit -s -m "Upgrade FalkorLib to the latest version" #{gemfile_lock} ) if File.exist?(gemfile_lock)
     end
-
+  end
 end # namespace falkorlib
 
 
 #.....................
 namespace :bootstrap do
-	###########   bootstrap:bundler   ###########
-	task :bundler do 
-		info "Bootstrap Bundler -- see http://bundler.io/"
-		error "Unable to find the 'bundle' command" unless command?('bundle')
-		run %{ bundle }
-	end 
+  ###########   bootstrap:bundler   ###########
+  task :bundler do
+    info "Bootstrap Bundler -- see http://bundler.io/"
+    error "Unable to find the 'bundle' command" unless command?('bundle')
+    run %( bundle )
+  end
 
-	###########   rvm   ###########
-	task :rvm do 
-		info "Boostrap RVM for this repository -- see https://rvm.io"
-		error "RVM is not installed -- see https://rvm.io/rvm/install for instructions" unless command?('rvm')
-		init_rvm(Dir.pwd)
-		# ['version', 'gemset'].each do |t| 
-		# 	error "unable to find the .ruby-#{t} file" unless File.exists?(".ruby-#{t}")
-		# end
-		info "=> initialize RVM -- see http://rvm.io"
-		run %{ rvm install `cat .ruby-version` }
-		rvm_current = `rvm current`.chomp
-		rvm_version = `cat .ruby-version`.chomp
-		rvm_gemset  = `cat .ruby-gemset`.chomp
-        if rvm_current.empty? or rvm_current !~ /#{rvm_version}[^@]*@#{rvm_gemset}/
-			warn "You need to manually force the reloading of the RVM configuration."
-			warn "To do that, simply run \n\t\tcd .. && cd -"
-			error "manual RVM reloading required"
-		end
-		#rvmenv = %x( rvm env --path -- `cat .ruby-version`@`cat .ruby-gemset`)
-		# info "=> Force reloading RVM configuration within $PWD"
-		# run %{ 
-        #    bash -l -c 'rvm use  `cat .ruby-version`' 
-        #    bash -l -c 'rvm gemset use `cat .ruby-gemset`'
-        #    bash -l -c 'rvm list && rvm gemset list'
-        # }
-		
-		info "=> installing the Bundler gem -- see http://bundler.io"
-		run %{ gem install bundler }
-	end 
+  ###########   rvm   ###########
+  task :rvm do
+    info "Boostrap RVM for this repository -- see https://rvm.io"
+    error "RVM is not installed -- see https://rvm.io/rvm/install for instructions" unless command?('rvm')
+    init_rvm(Dir.pwd)
+    # ['version', 'gemset'].each do |t|
+    #   error "unable to find the .ruby-#{t} file" unless File.exists?(".ruby-#{t}")
+    # end
+    info "=> initialize RVM -- see http://rvm.io"
+    run %( rvm install `cat .ruby-version` )
+    rvm_current = `rvm current`.chomp
+    rvm_version = `cat .ruby-version`.chomp
+    rvm_gemset  = `cat .ruby-gemset`.chomp
+    if rvm_current.empty? || rvm_current !~ /#{rvm_version}[^@]*@#{rvm_gemset}/
+      warn "You need to manually force the reloading of the RVM configuration."
+      warn "To do that, simply run \n\t\tcd .. && cd -"
+      error "manual RVM reloading required"
+    end
+    #rvmenv = %x( rvm env --path -- `cat .ruby-version`@`cat .ruby-gemset`)
+    # info "=> Force reloading RVM configuration within $PWD"
+    # run %{
+    #    bash -l -c 'rvm use  `cat .ruby-version`'
+    #    bash -l -c 'rvm gemset use `cat .ruby-gemset`'
+    #    bash -l -c 'rvm list && rvm gemset list'
+    # }
 
+    info "=> installing the Bundler gem -- see http://bundler.io"
+    run %( gem install bundler )
+  end
 end # namespace bootstrap
 
 
@@ -84,7 +82,6 @@ desc "Setup the repository"
 task :setup => ['bootstrap:rvm', 'bootstrap:bundler']
 
 
-# Empty task debug 
+# Empty task debug
 task :DEBUG do
 end
-

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: <Lun 2015-01-12 21:14 svarrette>
+# Time-stamp: <Fri 2016-11-11 15:40 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -14,48 +14,47 @@ require 'rubygems/tasks'
 
 #.....................
 namespace :gem do
-    Gem::Tasks::Console.new(:command => 'pry')
-
-    ###########  gem:release   ###########
-    desc "Release the gem "
-    task :release => [ :build ] do |t|
-        pkgdir = Gem::Tasks::Project::PKG_DIR
-        Dir.glob("*.gemspec") do |gemspecfile|
-            spec = Gem::Specification::load(gemspecfile)
-            name    = spec.name
-            version = spec.version
-            gem     = File.join( pkgdir , "#{name}-#{version}.gem")
-            unless File.exists?( gem )
-                warn "Unable to find the built gem '#{gem}'... Thus exiting."
-                next
-            end
-            info t.comment + " '#{gem}'"
-            really_continue?
-            a = run %{
+  Gem::Tasks::Console.new(:command => 'pry')
+
+  ###########  gem:release   ###########
+  desc "Release the gem "
+  task :release => [ :build ] do |t|
+    pkgdir = Gem::Tasks::Project::PKG_DIR
+    Dir.glob("*.gemspec") do |gemspecfile|
+      spec = Gem::Specification.load(gemspecfile)
+      name    = spec.name
+      version = spec.version
+      gem     = File.join( pkgdir, "#{name}-#{version}.gem")
+      unless File.exist?( gem )
+        warn "Unable to find the built gem '#{gem}'... Thus exiting."
+        next
+      end
+      info t.comment + " '#{gem}'"
+      really_continue?
+      a = run %(
               gem push #{gem}
-            }
-            error "Unable to publish the gem '#{gem}'" if a.to_i != 0
-        end
-    end # task gem:release
-	task :publish, :release
-
-    ###########   info   ###########
-    desc "Informations on the gem"
-    task :info do |t|
-        require "rubygems"
-        Dir.glob("*.gemspec") do |gemspecfile|
-            spec = Gem::Specification::load(gemspecfile)
-            info t.comment + " '#{spec.name}' (version #{spec.version})"
-            puts <<-eos
+      )
+      error "Unable to publish the gem '#{gem}'" if a.to_i.nonzero?
+    end
+  end # task gem:release
+  task :publish, :release
+
+  ###########   info   ###########
+  desc "Informations on the gem"
+  task :info do |t|
+    require "rubygems"
+    Dir.glob("*.gemspec") do |gemspecfile|
+      spec = Gem::Specification.load(gemspecfile)
+      info t.comment + " '#{spec.name}' (version #{spec.version})"
+      puts <<-eos
 - Summary:     #{spec.summary}
 - Author:      #{spec.author} #{spec.email}
 - Licence:     #{spec.license}
 - Homepage:    #{spec.homepage}
 - Description: #{spec.description}
 eos
-        end
-    end # task info
-
+    end
+  end # task info
 end # namespace gem
 
 # Until [Issue#13](https://github.com/postmodern/rubygems-tasks/issues/13) it solved,
@@ -72,13 +71,13 @@ Rake::Task['build'].enhance do
   end
 end
 
-[ 'major', 'minor', 'patch' ].each do |level|
-	Rake::Task["version:bump:#{level}"].enhance do 
-		warn "about to run the rspec tests to ensure the release can be done"
-		really_continue?
-		Rake::Task['rspec'].invoke
-	end
-end 
+%w(major minor patch).each do |level|
+  Rake::Task["version:bump:#{level}"].enhance do
+    warn "about to run the rspec tests to ensure the release can be done"
+    really_continue?
+    Rake::Task['rspec'].invoke
+  end
+end
 
 
 

data/lib/falkorlib/tasks/gem.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Ven 2014-06-20 00:10 svarrette>
+# Time-stamp: <Fri 2016-11-11 14:28 svarrette>
 ################################################################################
 #
 # FalkorLib rake tasks to pilot Gem operations
@@ -11,18 +11,19 @@ require 'falkorlib'
 require 'falkorlib/tasks'
 
 module FalkorLib #:nodoc:
+  # Rake tasks to pilot Gem operations
+  class GemTasks
 
-    # Rake tasks to pilot Gem operations
-    class GemTasks
-        include Rake::DSL if defined? Rake::DSL
+    include Rake::DSL if defined? Rake::DSL
 
-        # Install the gem  tasks for Rake
-        def install_tasks
-            load 'falkorlib/tasks/gem.rake'
-            load 'falkorlib/tasks/yard.rake'
-            load 'falkorlib/tasks/rspec.rake'
-        end
-    end # class FalkorLib::GemTasks
+    # Install the gem  tasks for Rake
+    def install_tasks
+      load 'falkorlib/tasks/gem.rake'
+      load 'falkorlib/tasks/yard.rake'
+      load 'falkorlib/tasks/rspec.rake'
+    end
+
+  end # class FalkorLib::GemTasks
 end # module FalkorLib
 
 # Now install them ;)

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: <Tue 2016-06-28 19:14 svarrette>
+# Time-stamp: <Fri 2016-11-11 15:41 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -13,118 +13,112 @@ require 'falkorlib/git'
 
 #.....................
 namespace :git do
-
-    include FalkorLib::Common
-    git_root_dir = FalkorLib::Git.rootdir
-    remotes = FalkorLib::Git.remotes
-    #ap remotes
-
-
-    ###########   git:fetch   ###########
-    #desc "Fetch the latest changes on remotes"
-    task :fetch do |t|
-        info "Fetch the latest changes on remotes" # t.comment
-        FalkorLib::Git.fetch()
-    end # task fetch
-
-    [ 'up', 'push' ].each do |op|
-
-        description = case op
-                      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}  ###########
-        #desc "#{description}"
-        task op.to_sym do |t|
-			info description # t.comment
-            if remotes.empty? || ! remotes.include?( 'origin' )
-                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 %{
+  include FalkorLib::Common
+  git_root_dir = FalkorLib::Git.rootdir
+  remotes = FalkorLib::Git.remotes
+  #ap remotes
+
+
+  ###########   git:fetch   ###########
+  #desc "Fetch the latest changes on remotes"
+  task :fetch do |_t|
+    info "Fetch the latest changes on remotes" # t.comment
+    FalkorLib::Git.fetch
+  end # task fetch
+
+  %w(up push).each do |op|
+    description = case op
+                  when 'up' then   "Update your local copy of the repository from GIT server"
+                  when 'push' then "Push your modifications onto the remote branches"
+                  end
+    ###########  git:{up,push}  ###########
+    #desc "#{description}"
+    task op.to_sym do |t|
+      info description # t.comment
+      if remotes.empty? || !remotes.include?( 'origin' )
+        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 %(
                       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
+        )
+        if (status.to_i.nonzero?)
+          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 (! FalkorLib.config.git[:submodules].empty?) or File.exists?("#{git_root_dir}/.gitmodules")
-        #.....................
-        namespace :submodules do
-            ###########   init   ###########
-            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)
-            end # task submodules:init
-
-        end # namespace submodules
-    end
-
-    if File.exists?("#{git_root_dir}/.gitmodules")
-        #.....................
-        namespace :submodules do
-
-            ########### git:submodules:update ###########
-            #desc "Update the git submodules from '#{git_root_dir}'"
-            task :update do |t|
-                info "Update the git submodules from '#{git_root_dir}'"  # t.comment
-                FalkorLib::Git.submodule_update( git_root_dir )
-            end
-
-            ########### git:submodules:upgrade ###########
-            desc "Upgrade the git submodules to the latest HEAD commit -- USE WITH CAUTION"
-            task :upgrade => [ :update] do |t|
-                info t.comment
-                FalkorLib::Git.submodule_upgrade( git_root_dir )
-            end
-        end # namespace git:submodules
-    end
-
-    unless FalkorLib.config.git[:subtrees].empty?
-        #.....................
-        namespace :subtrees do
-            ###########   git:subtrees:init  ###########
-            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
-
-            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
+
+  if (!FalkorLib.config.git[:submodules].empty?) || File.exist?("#{git_root_dir}/.gitmodules")
+    #.....................
+    namespace :submodules do
+      ###########   init   ###########
+      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)
+      end # task submodules:init
+    end # namespace submodules
+  end
+
+  if File.exist?("#{git_root_dir}/.gitmodules")
+    #.....................
+    namespace :submodules do
+      ########### git:submodules:update ###########
+      #desc "Update the git submodules from '#{git_root_dir}'"
+      task :update do |_t|
+        info "Update the git submodules from '#{git_root_dir}'" # t.comment
+        FalkorLib::Git.submodule_update( git_root_dir )
+      end
+
+      ########### git:submodules:upgrade ###########
+      desc "Upgrade the git submodules to the latest HEAD commit -- USE WITH CAUTION"
+      task :upgrade => [ :update] do |t|
+        info t.comment
+        FalkorLib::Git.submodule_upgrade( git_root_dir )
+      end
+    end # namespace git:submodules
+  end
+
+  unless FalkorLib.config.git[:subtrees].empty?
+    #.....................
+    namespace :subtrees do
+      ###########   git:subtrees:init  ###########
+      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
+
+      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' ]
-if (! FalkorLib.config.git[:submodules].empty?) or File.exists?("#{FalkorLib::Git.rootdir}/.gitmodules")
-	task :setup => [ 'git:submodules:init' ]
+if (!FalkorLib.config.git[:submodules].empty?) || File.exist?("#{FalkorLib::Git.rootdir}/.gitmodules")
+  task :setup => [ 'git:submodules:init' ]
 end
 unless FalkorLib.config.git[:subtrees].empty?
-	task :setup => [ 'git:subtrees:init' ]
+  task :setup => [ 'git:subtrees:init' ]
 end