falkorlib 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29361d1eaf30aff1060e7637f8673f97526b64d0
-  data.tar.gz: 23172d2ef795128d7d9a37443bb15dbf2a5b623b
+  metadata.gz: 7c4ac751e681194fa46db7b0e9a1a542d8ef01dc
+  data.tar.gz: c72d8fab6a413daad6189e65436539b49f4a9ef0
 SHA512:
-  metadata.gz: 1f94d7e8bc8f7c6e9810f4ca397528cb0beef83696684bab26dd597c2101cfe2bb6c62f8a4d30e113ee0d283bf7bb8f9192e5ff5a7cc3291b758fdef71b59a4f
-  data.tar.gz: 20bb94f68292bf491fa5f9b3afb6e59ad4cd9d63abc13cdc0bab23f15149094a03427c56487e8edfbc02e39c90aef9c5ba99b8a4aded59d9fc6185002a18a7e7
+  metadata.gz: f249fd1c98e79c512c78fbb04d5ac730a897f761c779d174fa94355f704ac5de36a248f290c3248ccc233d6a2244f2a763a6bed075316d06e3b43521f7897bb3
+  data.tar.gz: cd3e62ec9122aabad2a9eb834652e9118b8df52dbcce5010025ff5074d21159d587cf23595329086e392679402d11cd973b03fefa293383b8efef5815cbbcbb3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.6.8)
+    falkorlib (0.6.9)
       artii (>= 2.1)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
@@ -31,11 +31,11 @@ GEM
     configatron (3.2.0)
     deep_merge (1.0.1)
     diff-lcs (1.1.3)
-    diffy (3.0.7)
+    diffy (3.1.0)
     docile (1.1.5)
     ethon (0.7.0)
       ffi (>= 1.3.0)
-    facter (2.4.1)
+    facter (2.4.6)
       CFPropertyList (~> 2.2.6)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
@@ -88,10 +88,10 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.5.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    tins (1.3.5)
+    tins (1.8.2)
     travis (1.6.14)
       addressable (~> 2.3)
       backports
@@ -124,3 +124,6 @@ DEPENDENCIES
   travis (~> 1.6)
   travis-lint (~> 1.8)
   yard (~> 0.8)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -41,7 +41,7 @@ Or install it yourself as:
 **Note** you probably wants to do the above within an isolated environment. See
   below for some explanation on this setup.  
 
-## Usage 
+## Usage
 
 This library features two aspects
 

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2016-02-04 12:18 svarrette>
+# Time-stamp: <Mon 2016-02-22 23:25 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -207,6 +207,8 @@ module FalkorLib
                 run %{ bundle init }
                 info " ==>  configuring Gemfile with Falkorlib"
                 File.open( gemfile, 'a') do |f|
+                    f.puts "source 'https://rubygems.org'"
+                    f.puts ""
                     f.puts "gem 'falkorlib' #, :path => '~/git/github.com/Falkor/falkorlib'"
                 end
                 FalkorLib::Git.add(gemfile) if use_git
@@ -406,6 +408,11 @@ module FalkorLib
             else
                 config[:name]     = ask("\tProject name: ", name) unless options[:name]
             end
+            if options[:rake]
+                options[:make] = false
+                options[:rvm]  = true
+            end
+            config[:type] << :rvm  if options[:rake]
             # Type of project
             config[:type] << :latex if options[:latex]
             if config[:type].empty?
@@ -415,6 +422,8 @@ module FalkorLib
                 config[:type] << [ :ruby, :rvm ] if [ :gem, :rvm, :octopress, :puppet_module ].include?( t )
                 config[:type] << :python if t == :pyenv
             end
+            config[:type].uniq!
+            ap config
             config[:type] = config[:type].uniq.flatten
             # Apply options (if provided)
             [ :name, :forge ].each do |k|
@@ -513,8 +522,12 @@ module FalkorLib
             raise FalkorLib::ExecError "Not used in a Git repository" unless FalkorLib::Git.init?
             path  = normalized_path(dir)
             relative_path_to_root = (Pathname.new( FalkorLib::Git.rootdir(dir) ).relative_path_from Pathname.new( File.realpath(path)))
-            FalkorLib::Common.error "Already at the root directory of the Git repository" if "#{relative_path_to_root}" == "."
+            if "#{relative_path_to_root}" == "."
+                FalkorLib::Common.warning "Already at the root directory of the Git repository"
+                FalkorLib::Common.really_continue?
+            end
             target = options[:name] ? options[:name] : '.root'
+            puts "Entering '#{relative_path_to_root}'"
             unless File.exists?( File.join(path, target))
                 warning "creating the symboling link '#{target}' which points to '#{relative_path_to_root}'" if options[:verbose]
                 # Format: ln_s(old, new, options = {}) -- Creates a symbolic link new which points to old.
@@ -523,6 +536,8 @@ module FalkorLib
                     run %{ ln -s #{relative_path_to_root} #{target} }
                 end
                 FalkorLib::Git.add(File.join(path, target), "Add symlink to the root directory as .root")
+            else
+                puts "  ... the symbolic link '#{target}' already exists"
             end
         end # rootlink
 
@@ -540,14 +555,39 @@ module FalkorLib
             path   = normalized_path(dir)
             rootdir = FalkorLib::Git.rootdir(path)
             info "Create a symlink to the one of Falkor's Makefile"
-            # Add Falkor's
+            # Add Falkor's Makefiles
             submodules = FalkorLib.config[:git][:submodules]
             submodules['Makefiles'] = {
                                        :url   => 'https://github.com/Falkor/Makefiles.git',
                                        :branch => 'devel'
                                       } if submodules['Makefiles'].nil?
             FalkorLib::Git.submodule_init(rootdir, submodules)
-
+            FalkorLib::Bootstrap.rootlink(dir) 
+            dst = File.join('.root', options[:refdir])
+            ap options
+            makefile = 'Makefile'
+            type     = 'latex'
+            # recall to place the default option (--latex) at the last position
+            [ :gnuplot, :images, :generic, :markdown] .each do |e|
+                if options[e.to_sym]
+                    type = e.to_s
+                    break
+                end
+            end
+            makefile = 'Makefile.insubdir' if options[:generic]
+            makefile = 'Makefile.to_html' if options[:markdown]
+            dst = File.join(dst, type, makefile)
+            unless File.exists?( File.join(path, 'Makefile'))
+                info "Bootstrapping #{type.capitalize} Makefile (as symlink to Falkor's Makefile)"
+                really_continue?
+                Dir.chdir( path ) do
+                    run %{ ln -s #{dst} Makefile }
+                end
+                ap File.join(path, 'Makefile')
+                FalkorLib::Git.add(File.join(path, 'Makefile'), "Add symlink to the #{type.capitalize} Makefile")
+            else
+                puts "  ... Makefile already setup"
+            end
         end # makefile_link
 
 

data/lib/falkorlib/cli/link.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2015-10-22 20:16 svarrette>
+# Time-stamp: <Mon 2016-02-22 23:25 svarrette>
 ################################################################################
 
 require 'thor'
@@ -27,11 +27,12 @@ module FalkorLib
 
             ###### make ######
             method_option :latex, :default => true, :type => :boolean, :aliases => '-l', :desc => "Makefile to compile LaTeX documents"
-            method_option :gnuplot, :type => :boolean, :aliases => ['--plot', '-g', '-p'], :desc => "Makefile to compile GnuPlot scripts"
+            method_option :gnuplot, :type => :boolean, :aliases => ['--plot', '-p'], :desc => "Makefile to compile GnuPlot scripts"
+            method_option :generic, :type => :boolean, :aliases => '-g', :desc => "Generic Makefile for sub directory"
             method_option :markdown, :type => :boolean, :aliases => '-m', :desc => "Makefile to convert Markdown files to HTML"
-            method_option :markdown, :type => :boolean, :aliases => '-m', :desc => "Makefile to convert Markdown files to HTML"
-            method_option :repo, :default => "#{FalkorLib.config[:git][:submodulesdir]}/Makefiles",
-              :aliases => '-r', :desc => "Path to Falkor's Makefile repository (Relative to Git root dir)"
+            method_option :images, :type => :boolean, :aliases => [ '-i', '--img' ], :desc => "Makefile to optimize images"
+            method_option :refdir, :default => "#{FalkorLib.config[:git][:submodulesdir]}/Makefiles",
+              :aliases => '-d', :desc => "Path to Falkor's Makefile repository (Relative to Git root dir)"
             method_option :target, :aliases => '-t', :desc => "Symlink target"
             #......................................
             desc "make [options]", "Create a symlink to one of Falkor's Makefile, set as Git submodule"

data/lib/falkorlib/tasks/rspec.rake

@@ -34,7 +34,7 @@ begin
         #t.pattern = "spec/**/versioning_*spec.rb"
         #t.pattern = "spec/**/puppet*spec.rb"
         #t.pattern = "spec/**/bootstrap*spec.rb"
-        #t.pattern = "spec/**/gitf*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, 8  
+	    MAJOR, MINOR, PATCH = 0, 6, 9  
 	    
 	    module_function
 	    

data/spec/falkorlib/git_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # git_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Dim 2015-01-25 00:00 svarrette>
+# Time-stamp: <Mon 2016-02-22 23:34 svarrette>
 #
 # @description Check the Git operations
 #
@@ -153,7 +153,8 @@ describe FalkorLib::Git do
             c.should_not be_empty
             t = c.is_a? Array
             t.should be_true
-            c.length.should == 2
+            ap c
+            c.length.should >= 2
         end
 
         it "#config -- check pattern 2" do
@@ -169,7 +170,8 @@ describe FalkorLib::Git do
             c.should_not be_empty
             t = c.is_a? Hash
             t.should be_true
-            c.keys.length.should == 2
+            ap c
+            c.keys.length.should >= 2
         end
 
         it "#config -- check hash correctness" do

data/templates/README/header_readme.erb

@@ -5,12 +5,11 @@
 <% end %>
 ![By <%= config[:by] %>](https://img.shields.io/badge/by-<%= config[:by] %>-blue.svg) [![<%= config[:forge] %>](https://img.shields.io/badge/git-<%= config[:forge] %>-lightgray.svg)](<%= config[:source] %>) [![Issues](https://img.shields.io/badge/issues-<%= config[:forge] %>-green.svg)](<%= config[:issues_url] %>)
 
-       Time-stamp: <Thu 2016-02-04 12:11 svarrette>
+       Time-stamp: <Mon 2016-02-22 22:04 svarrette>
 
        <%= ::Artii::Base.new().asciify( config[:name] ).split("\n").join("\n       ") %>
        Copyright (c) <%= Time.now.year %> <%= config[:author] %> <<%= config[:mail] %>>
 
-<%= config[:summary] %>
 
 ## Synopsis
 
@@ -60,3 +59,14 @@ Later on, you can upgrade the [Git submodules](.gitmodules) to the latest versio
 <% else %>
     $> rake git:submodules:upgrade
 <% end %>
+
+If upon pulling the repository, you end in a state where another collaborator have upgraded the Git submodules for this repository, you'll end in a dirty state (as reported by modifications within the `.submodules/` directory). In that case, just after the pull, you **have to run** the following to ensure consistency with regards the Git submodules:
+
+<% if options[:make] %>
+    $> make update
+<% else %>
+    $> rake git:submodules:update
+<% end %>
+
+
+

data/templates/README/readme_issues.erb

@@ -2,3 +2,6 @@
 ## Issues / Feature request
 
 You can submit bug / issues / feature request using the [`<%= config[:by] %>/<%= name.downcase %>` Project Tracker](<%= config[:issues_url] %>)
+
+
+

data/templates/README/readme_rvm.erb

@@ -20,3 +20,4 @@ If things are fine, you should  be able to access the list of available tasks by
 
 You probably want to activate the bash-completion for rake tasks.
 I personally use the one provided [here](https://github.com/ai/rake-completion).
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sebastien Varrette aka Falkor's Common library to share Ruby code and {rake,cap}