falkorlib 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c37a3c0993e8e543f6b895c18aeaa1050696f3
-  data.tar.gz: 10833cc728d26411d8c90f45d5edf066c78862fd
+  metadata.gz: da8fc3d2a1cd71f1081cdbc7e4e82360a8a31d6d
+  data.tar.gz: ded248e0cc1540be8fa3814787a1886a4d6297a7
 SHA512:
-  metadata.gz: b4a11fe0b45860ec73947829988297672128d4715fe481e318db0c46a1e424774048d859d3e088a25b8e52cc6eaacdd29e1c2bda5bac81476864081daaf11941
-  data.tar.gz: d59c872bc5fdf200aa55f41cba4e874ce5aab6e1feda3ec72be4fb09ecfc20bafb30cb19cd8ffd1930ff8e9bb206bab9a3c717c8d2364f9810caf964033a178a
+  metadata.gz: 2aca9bc92d82bfc3b23553e45e06d69f74b605d49ae048a0434c7715889a924f17d9792e7d477762a0e172265dcdde3e8a5ae956e6d32ccaa4bb6c7025a1ce52
+  data.tar.gz: a09bea7bd980510a2b73cd814486e6f1e68c89276fb6e19ebaa6c70ee709b265bd12bebde12445139736e061458a0a72c3d4aa73f8aaae969aaf6e5d2f045992

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.6.13)
+    falkorlib (0.6.14)
       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: <Tue 2016-06-28 18:51 svarrette>
+# Time-stamp: <Wed 2016-06-29 14:09 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -561,10 +561,11 @@ module FalkorLib
             else
                 default_project_dir += "/#{config[:name]}" unless default_project_dir =~ /#{config[:name]}$/
             end
-            project_dir = ask("\tLaTeX Sources directory (relative to the Git root directory)", "#{default_project_dir}/src")
+            project_dir = ask("\tLaTeX Sources directory (relative to the Git root directory)", "#{default_project_dir}")
             raise FalkorLib::ExecError "Empty project directory" if project_dir.empty?
-            subdir = File.join(rootdir, project_dir)
-            if File.exists?(File.join(subdir, '.root'))
+            src_project_dir = File.join(project_dir, 'src')
+            srcdir = File.join(rootdir, sub_project_dir)
+            if File.exists?(File.join(srcdir, '.root'))
                 warn "The directory '#{project_dir}' seems to have been already initialized"
                 really_continue? unless options[:force]
             end
@@ -577,25 +578,30 @@ module FalkorLib
                                       } if [ :article, :beamer, :bookchapter].include?(type)
             submodules['beamerthemeFalkor'] = { :url => 'https://github.com/Falkor/beamerthemeFalkor' } if type == :beamer
             FalkorLib::Git.submodule_init(rootdir, submodules)
-            info "bootstrapping the #{type} project sources in '#{project_dir}'"
+            info "bootstrapping the #{type} project sources in '#{src_project_dir}'"
             # Create the project directory
             Dir.chdir( rootdir ) do
-                run %{ mkdir -p #{project_dir}/images } unless File.directory?("#{subdir}/images")
-            end
-            info "populating '#{project_dir}'"
-            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)
-                submoduledir = (f =~ /beamer/) ? 'beamerthemeFalkor' : 'Makefiles/latex'
-                dst = "#{FalkorLib.config[:git][:submodulesdir]}/#{submoduledir}/#{f}"
-                Dir.chdir( subdir ) do
-                    run %{ ln -s .root/#{dst} #{f} } unless File.exist?( File.join(subdir, f) )
-                end
+                run %{ mkdir -p #{src_project_dir}/images } unless File.directory?("#{srcdir}/images")
+            end
+            info "populating '#{src_project_dir}'"
+            #FalkorLib::Bootstrap::Link.root(srcdir, { :verbose => true} )
+            FalkorLib::Bootstrap::Link.makefile(srcdir)
+            [ '_style.sty', '.gitignore' ].each do |f|
+              Dir.chdir( srcdir ) do
+                run %{ ln -s '.makefile.d/latex/#{dst} #{f} } unless File.exist?( File.join(srcdir, f) )
+              end
+            end
+            if type == :beamer
+              f = 'beamerthemeFalkor.sty'
+              dst = "#{FalkorLib.config[:git][:submodulesdir]}/beamerthemeFalkor/#{f}"
+              Dir.chdir( srcdir ) do
+                run %{ ln -s '.root/#{dst} #{f} } unless File.exist?( File.join(srcdir, f) )
+              end
             end
+
             # Bootstrap the directory
             templatedir = File.join( FalkorLib.templates, 'latex', "#{type}")
-            unless File.exists?( File.join(subdir, "#{config[:name]}.tex"))
+            unless File.exists?( File.join(srcdir, "#{config[:name]}.tex"))
                 info "gathering information for the LaTeX templates"
                 prefix = case type
                          when :article
@@ -613,27 +619,31 @@ module FalkorLib
                     next if k == :name
                     config[k.to_sym] = ask( "\t" + sprintf("%-20s", "#{prefix}#{k.capitalize}"), v)
                 end
-                init_from_template(templatedir, subdir, config, {:no_interaction => true,
+                init_from_template(templatedir, srcdir, config, {:no_interaction => true,
                                                                  :no_commit      => true })
                 # Rename the main file
-                Dir.chdir( subdir ) do
+                Dir.chdir( srcdir ) do
                     run %{ mv main.tex #{config[:name]}.tex }
                 end
             end
             # Create the trash directory
-            trash(subdir)
+            trash(srcdir)
 
             # populate the images/ directory
             baseimages  = File.join( FalkorLib.templates, 'latex', 'images')
-            #images_makefile_src = "#{FalkorLib.config[:git][:submodulesdir]}/Makefiles/generic/Makefile.insubdir"
-            images = File.join(subdir, 'images')
+            #images_makefile_src = "#{FalkorLib.config[:git][:submodulesdir]}/Makefiles/generic/Makefile.insrcdir"
+            images = File.join(srcdir, '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'))
             end
-            FalkorLib::Bootstrap::Link.makefile(images, { :src => true } )
+            FalkorLib::Bootstrap::Link.makefile(images, { :images => true } )
+
+            # Prepare the src/ directory
+            FalkorLib::Bootstrap::Link.makefile(File.join(rootdir, project_dir), { :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:58 svarrette>
+# Time-stamp: <Wed 2016-06-29 13:33 svarrette>
 ################################################################################
 # Interface for Bootstrapping various symlinks within your project
 #
@@ -32,7 +32,7 @@ module FalkorLib
             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"
+                info "Create a symlink to one of Falkor's Makefile"
                 # Add Falkor's Makefiles
                 submodules = FalkorLib.config[:git][:submodules]
                 submodules['Makefiles'] = {
@@ -41,7 +41,9 @@ module FalkorLib
                 } if submodules['Makefiles'].nil?
                 FalkorLib::Git.submodule_init(rootdir, submodules)
                 FalkorLib::Bootstrap::Link.root(dir)
-                dst        = File.join('.root', options[:refdir])
+                refdir = File.join(FalkorLib.config[:git][:submodulesdir], 'Makefiles')
+                refdir = options[:refdir] unless options[:refdir].nil?
+                dst        = File.join('.root', refdir)
                 makefile_d = '.makefile.d'
                 unless File.exists?(File.join(path, makefile_d))
                     Dir.chdir( path ) do

data/lib/falkorlib/version.rb

@@ -19,18 +19,18 @@ module FalkorLib #:nodoc:
         # MAJOR: Defines the major version
         # MINOR: Defines the minor version
         # PATCH: Defines the patch version
-	    MAJOR, MINOR, PATCH = 0, 6, 13  
-	    
+	    MAJOR, MINOR, PATCH = 0, 6, 14
+
 	    module_function
-	    
+
 	    ## Returns the major version ( big release based off of multiple minor releases )
 	    def major
 		    MAJOR
 	    end
-	    
+
 	    ## Returns the minor version ( small release based off of multiple patches )
 	    def minor
-		    MINOR		    
+		    MINOR
 	    end
 
         ## Returns the patch version ( updates, features and (crucial) bug fixes )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Sebastien Varrette