falkorlib 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c4ac751e681194fa46db7b0e9a1a542d8ef01dc
-  data.tar.gz: c72d8fab6a413daad6189e65436539b49f4a9ef0
+  metadata.gz: 809f6aba9cf7153137af45ab65e4702617e346b7
+  data.tar.gz: fe8a4009d51b091fed482c122289a47cb4d54a97
 SHA512:
-  metadata.gz: f249fd1c98e79c512c78fbb04d5ac730a897f761c779d174fa94355f704ac5de36a248f290c3248ccc233d6a2244f2a763a6bed075316d06e3b43521f7897bb3
-  data.tar.gz: cd3e62ec9122aabad2a9eb834652e9118b8df52dbcce5010025ff5074d21159d587cf23595329086e392679402d11cd973b03fefa293383b8efef5815cbbcbb3
+  metadata.gz: bfbc07e1fd264e5c1eb71a3cdb535d368cb7b618448a2cf5c8e04e3a983d7d6b92956fc0631931365d0fae74fe0fb19d5b8308686cfc0076de256df9f4aee972
+  data.tar.gz: 338cbf7fcd13a1424143b0b85a8cc3d503e05c7fb1218dbbb920917c85d5f1e5edcc0cbb496118488f4892d172c0f184b85314a3cd2c2f499dbffb45bff6e599

data/.travis.yml

@@ -6,8 +6,6 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq git-flow git-core
 rvm:
- - 1.9.2
- - 1.9.3
  - 2.0.0
  - 2.1
  - 2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.6.9)
+    falkorlib (0.6.11)
       artii (>= 2.1)
       awesome_print (~> 1.2)
       configatron (~> 3.2)

data/lib/falkorlib/bootstrap.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mer 2015-01-21 22:35 svarrette>
+# Time-stamp: <Sun 2016-03-27 23:21 svarrette>
 ################################################################################
 # Management of Bootstrapping operations
 
@@ -11,5 +11,5 @@ module FalkorLib #:nodoc:
 end # module FalkorLib
 
 require "falkorlib/bootstrap/base"
+require "falkorlib/bootstrap/link"
 #require "falkorlib/bootstrap/repo"
- 

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mon 2016-02-22 23:25 svarrette>
+# Time-stamp: <Sun 2016-03-27 23:20 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -482,7 +482,7 @@ module FalkorLib
             [ :latex ].each do |type|
                 erbfiles << "readme_#{type}.erb" if options[type.to_sym] and File.exist?( File.join(templatedir, "readme_#{type}.erb"))
             end
-            erbfiles << "readme_issues.erb"  
+            erbfiles << "readme_issues.erb"
             erbfiles << "readme_git.erb"     if FalkorLib::Git.init?(dir)
             erbfiles << "readme_gitflow.erb" if FalkorLib::GitFlow.init?(dir)
             erbfiles << "readme_rvm.erb"     if config[:type].include?(:rvm)
@@ -513,84 +513,6 @@ module FalkorLib
             #
         end # readme
 
-        ###### rootlink ######
-        # Create a symlink '.root' targeting the relative path to the git root directory
-        # Supported options:
-        #  * :name [string] name of the symlink ('.root' by default)
-        ##
-        def rootlink(dir = Dir.pwd, options = {})
-            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)))
-            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.
-                #FileUtils.ln_s "#{relative_path_to_root}", "#{target}"
-                Dir.chdir( path ) do
-                    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
-
-        ###### makefile_link ######
-        # Create a symlink to the one of Falkor's Makefile, typically bring as a Git submodule
-        # Supported options:
-        #  * :force    [boolean] force action
-        #  * :latex    [boolean] Makefile to compile LaTeX documents
-        #  * :gnuplot  [boolean] Makefile to compile GnuPlot scripts
-        #  * :markdown [boolean] Makefile to convert Markdown files to HTML
-        #  * :target   [string]  Path to target
-        #  * :repo     [string]  Path to Falkor's Makefile repository
-        ##
-        def makefile_link(dir = Dir.pwd, options = {})
-            path   = normalized_path(dir)
-            rootdir = FalkorLib::Git.rootdir(path)
-            info "Create a symlink to the one of Falkor's Makefile"
-            # 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
-
-
 
 
         ###### latex ######
@@ -659,7 +581,7 @@ module FalkorLib
                 run %{ mkdir -p #{project_dir}/images } unless File.directory?("#{subdir}/images")
             end
             info "populating '#{project_dir}'"
-            rootlink(subdir, { :verbose => true} )
+            FalkorLib::Bootstrap::Link.root(subdir, { :verbose => true} )
             # Prepare the links from the sub-module files
             [ 'Makefile', '_style.sty', '.gitignore', 'beamerthemeFalkor.sty' ].each do |f|
                 next if (f =~ /beamer/) and (type != :beamer)

data/lib/falkorlib/bootstrap/link.rb

@@ -0,0 +1,110 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Sun 2016-03-27 23:48 svarrette>
+################################################################################
+# Interface for Bootstrapping various symlinks within your project
+#
+require "falkorlib"
+require "falkorlib/common"
+require 'erb'      # required for module generation
+require 'artii'
+require 'facter'
+
+include FalkorLib::Common
+
+
+module FalkorLib
+    module Bootstrap
+        module Link
+
+            module_function
+
+            ###### makefile ######
+            # Create a symlink to the one of Falkor's Makefile, typically bring as a Git submodule
+            # Supported options:
+            #  * :force    [boolean] force action
+            #  * :latex    [boolean] Makefile to compile LaTeX documents
+            #  * :gnuplot  [boolean] Makefile to compile GnuPlot scripts
+            #  * :markdown [boolean] Makefile to convert Markdown files to HTML
+            #  * :refdir   [string]  Path to Falkor's Makefile repository
+            #  * :src      [boolean] Path to latex_src
+            ##
+            def makefile(dir = Dir.pwd, options = {})
+                path   = normalized_path(dir)
+                rootdir = FalkorLib::Git.rootdir(path)
+                info "Create a symlink to the one of Falkor's Makefile"
+                # 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::Link.root(dir)
+                dst        = File.join('.root', options[:refdir])
+                makefile_d = '.makefile.d'
+                unless File.exists?(File.join(path, makefile_d))
+                    Dir.chdir( path ) do
+                        run %{ ln -s #{dst} #{makefile_d} }
+                        FalkorLib::Git.add(File.join(path, makefile_d), "Add symlink '#{makefile_d}' to Falkor's Makefile directory")
+                    end
+                end
+                #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
+                type = 'latex_src' if options[:src]
+                makefile = 'Makefile.insubdir' if options[:generic]
+                makefile = 'Makefile.to_html'  if options[:markdown]
+                dst = File.join(makefile_d, 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
+
+            ###### rootlink ######
+            # Create a symlink '.root' targeting the relative path to the git root directory
+            # Supported options:
+            #  * :name [string] name of the symlink ('.root' by default)
+            ##
+            def root(dir = Dir.pwd, options = {})
+                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)))
+                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.
+                    #FileUtils.ln_s "#{relative_path_to_root}", "#{target}"
+                    Dir.chdir( path ) do
+                        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
+
+
+        end # module Link
+    end # module Bootstrap
+end # module FalkorLib

data/lib/falkorlib/cli/link.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mon 2016-02-22 23:25 svarrette>
+# Time-stamp: <Sun 2016-03-27 23:47 svarrette>
 ################################################################################
 
 require 'thor'
@@ -21,23 +21,29 @@ module FalkorLib
             #......................................
             desc "rootdir [options]", "Create a symlink '.root' which targets the root of the repository"
             def rootdir(dir = Dir.pwd)
-                FalkorLib::Bootstrap.rootlink(dir, options)
+                FalkorLib::Bootstrap::Link.root(dir, options)
             end # rootdir
 
 
             ###### make ######
-            method_option :latex, :default => true, :type => :boolean, :aliases => '-l', :desc => "Makefile to compile LaTeX documents"
-            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 :images, :type => :boolean, :aliases => [ '-i', '--img' ], :desc => "Makefile to optimize images"
+            method_option :latex, :default => true, :type => :boolean, :aliases => '-l',
+                          :desc => "Makefile to compile LaTeX documents"
+            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 :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"
+            method_option :src,  :type => :boolean, :aliases => [ '--src', '-s' ],
+                          :desc => "Path to Falkor's Makefile for latex_src"
             #......................................
             desc "make [options]", "Create a symlink to one of Falkor's Makefile, set as Git submodule"
             def make(dir = Dir.pwd)
-                FalkorLib::Bootstrap.makefile_link(dir, options)
+                FalkorLib::Bootstrap::Link.makefile(dir, options)
             end # make
 
 

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.11
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -363,6 +363,7 @@ files:
 - lib/falkorlib.rb
 - lib/falkorlib/bootstrap.rb
 - lib/falkorlib/bootstrap/base.rb
+- lib/falkorlib/bootstrap/link.rb
 - lib/falkorlib/cli.rb
 - lib/falkorlib/cli/config.rb
 - lib/falkorlib/cli/link.rb