hyla 1.0.7.pre.1 → 1.0.7.pre.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjk4ODAzYjZhZDcwODI0ZmRlM2IxYWU5MGUwYWUzNGY3MWZmMGUxMg==
+    MjNjM2MzODViOTJjMGJmMzA5MDZmYTE3N2FmZGFiZmQ4NDY5ZThhYQ==
   data.tar.gz: !binary |-
-    MjJhYzVlNjA3ODkzNDIyN2VmYTg2NWM4ZDMyOTU2NTdhYWQ3ZGFkOA==
+    YWYzNmY3N2Q3YThmMGVjYmIyZjVjNDJhZTFlMzllMGViNTAyM2EzOQ==
 SHA512:
   metadata.gz: !binary |-
-    YjY1MzM2ODUwZWJmMzhhZWVlOGZkYjQyMGFhNzFiYmFjNTYzMWU4YThjOTcw
-    NzI2YzMwNWQ0M2NlYzRmNzNjZTgyNTQ5MjgyMWNjOWNhMWQxZDZhMGY1YWE3
-    NzhiNWYzZTAwZGU5MTg2NGE5Y2NkMmY4OGNmYmM5ZTdhZjU2ZmY=
+    NDAwMjRhZjlkNzczMDM3NmRmZWE5MjUyMDE0MTg4ZDQzNjZiZWQzMWJlZDYz
+    YjgwZDMyNWMyMzBlMjRhOTM3ZDdlM2RjYTVjNTNiODI4NTFmNmZmYjlmODgw
+    ZmVjYzlmMGMxNDFlN2E0NDhiY2Y3NDI1MGQyMDBiODNmMzdmODQ=
   data.tar.gz: !binary |-
-    NGI4ODIwYTAxOGZjNjU1NGQ4Nzg0YzViOTI0OWE2MjgxNjBkN2U0YzQwZWUw
-    YTJmODVhYTI4ODVmNzQxZDQ3NjQ4YmI5NzdjMWE2NzQ4YTk5NGEwZmY3MGQx
-    ZDE4NTIxODc2ZGNkYjc4OTc1MDE1YTA1MGNjZTE0YTc5YjM4ZTE=
+    NmJlMzcxYThhODcyOTFmMmU1ZmQ5NDkzZDUzMmUyNmYyZDU5OTU4Mzk0ODc4
+    ODA5MGM5YTU4ZjBhMWIwNmY1MGQxY2I0ODVkNDIwNzgyZDdhZmU1YTg0ZjZi
+    ZTExYmJlMGM1ZGQ0N2YxMTMwM2YxM2E5YWMwOWZmY2MzODI5NWQ=

data/.gitignore

@@ -1,3 +1,8 @@
+## SASS/Compass
+**/lib/resources/assets/.sass-cache/
+**/lib/resources/assets/sass/.sass-cache/
+**/lib/resources/assets/sass/styles
+
 *.gem
 *.rbc
 *.lock

data/README.adoc

@@ -38,63 +38,11 @@ hyla will include 'awestruct'
 
 The Hyla project name comes from an arboreal http://en.wikipedia.org/wiki/Hyla[frog] living in equatorial regions of Europe, Asia or Americas. Its name was inspired by the companion of Hercule (Hylas) in Greek mythology.
 
-== Prerequisites
+== Developer
 
-- https://github.com/sstephenson/ruby-build#readme[rbenv-build] which let you to deploy a pre-compiled version of Ruby
-- https://github.com/sstephenson/rbenv[rbenv] to manage different versions of Ruby
-- https://www.ruby-lang.org/en/[Ruby] 1.9.3-p484
-- http://guides.rubygems.org/[RubyGems] to install Ruby Applications
-- http://feedback.livereload.com/knowledgebase/articles/86242-how-do-i-install-and-use-the-browser-extensions-[How do I install and use the browser extensions for LiveReload].
-Be sure to enable the option “Allow access to file URLs” checkbox in Tools > Extensions > LiveReload after installation of Chrome Extension.
-
-== Installation
-
-The latest source code is located in the {sources}[Hyla git repository] on GitHub. Hyla can be installed via the +gem+ command, bundler.
-
-Use `gem install` command to deploy Hyla :
-
-    $ gem install hyla -y
-    
-NOTE :  The option `-y` will tell to rubyGems to deploy the gem but also the dependencies required 
-
-An alternative is to create a Gemfile and add this line :
-
-    gem 'hyla'
-
-And then execute:
-
-    $ bundle
-
-**Or** install it yourself as:
-
-    $ gem install hyla -v 1.0.6
-
-== For Developer's only
-
-    Clone Git project locally, move to Hyla directory and execute the following commands
-    gem build hyla.gemspec
-    sudo gem install hyla-1.0.x.gem -l
-
-== To publish Hyla to Gem Repo
-
-    gem build hyla.gemspec
-    gem install hyla-1.0.x.gem -l
-    gem push hyla-1.0.x.gem
-
-== To delete a release pushed to RubyGems (= yank)
-
-    gem yank hyla -v 1.0.x
-
-== To create a release, generate a tagged release and publish it to Gem Repo
-
-    gem build hyla.gemspec
-    gem install hyla-1.0.6.gem
-    git commit -m "Release Hyla 1.0.6" -a
-    git push
-    git tag -a hyla-1.0.6 -m "Release hyla 1.0.6"
-    git push origin hyla-1.0.6
-
-    gem push hyla-1.0.6.gem
+* link:documentation/prerequisites.adoc[Prerequisites]
+* link:documentation/developer.adoc["How to install, build the gem"]
+* Using a Docker container
 
 == Usage
 
@@ -113,7 +61,7 @@ More info about options and commands available can be find by running the `comma
 
 == Documentation
 
-The `hyla` documentation is available at the link:documentation/introduction.adoc[following address]
+The `hyla` documentation is available at this link:documentation/introduction.adoc[address]
 
 == Copyright and Licensing
 

data/Rakefile

@@ -1,9 +1,28 @@
+libdir = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+#require 'compass'
+#require 'compass/sass_compiler'
+
+# Dir["#{dir}/*.scss"].select do | f |
+#   p "File : #{f}"
+#   Compass.add_configuration({
+#                                 :sass_dir => '.',
+#                                 :css_dir => 'styles',
+#                                 :fonts_dir => 'fonts',
+#                                 :output_style => :compressed
+#                             }, 'alwaysmin' # A name for the configuration, can be anything you want
+#   )
+#   Compass.sass_compiler.compile(f.to_s, '#{f.to_s}.css')
+# end
+
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'bundler/version'
-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'sass'
+require 'hyla/configuration'
+require 'font-awesome-sass'
 
 #############################################################################
 #
@@ -15,7 +34,7 @@ def name
 end
 
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line = File.read("lib/#{name}/project.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
@@ -31,31 +50,83 @@ def gem_file
   "#{name}-#{version}.gem"
 end
 
+def sass_assets
+  Hyla::Configuration.assets
+end
+
+def revealjs_css_theme_assets
+  [Hyla::Configuration.assets, 'revealjs', 'css', 'theme'] * '/'
+end
+
+def revealjs_css_vendor_assets
+  [Hyla::Configuration.assets, 'revealjs', 'lib', 'css'] * '/'
+end
+
+def default_compilation_style
+  'compressed'
+end
+
+#
+# Compass Style Values to generate the CSS file : nested, expanded, compact, compressed
+#
+
+style = ENV["STYLE"] || "nested"
+
 #############################################################################
 #
 # Standard tasks
 #
 #############################################################################
-
 Rake::TestTask.new do |t|
   t.libs << 'test'
 end
 
-desc "Run tests"
-task :default => :test
-
 # Simple Test case
 task :test do
   ruby "test/my_test.rb"
 end
 
-task :build1 do
+desc "Run tests"
+task :default => :test
+
+# Generate CSS files
+task :compass do
+  puts "\n## Compiling Sass"
+
+  # path = Gem.loaded_specs['font-awesome-sass'].full_gem_path + "/assets/stylesheets"
+  
+  #Go to the compass project directory
+  Dir.chdir File.join(sass_assets, "sass") do |dir|
+    puts "Sass dir : #{dir}"
+    # -s #{style} -I #{path}
+    system "compass compile --fonts-dir 'fonts' --css-dir 'styles' --sass-dir '.' "
+
+    # Copy css to RevealJS theme
+    # p revealjs_css_assets
+    system "cp styles/gpe.css #{revealjs_css_theme_assets}"
+    system "cp styles/font-awesome.css #{revealjs_css_vendor_assets}/font-awesome-4.3.0.css"
+  end
+  
+end
+
+# Build the Gem
+task :build do
   system "gem build #{gemspec_file}"
 end
 
-# Build project
-task :build2 => :gemspec do
+# Build the Gem & deploy it locally
+task :install => :build do
+  system "gem install #{gem_file} -l"
+end
+
+# Build the Gem, install it locally & push it
+task :deploy => :install do
+  system "gem push #{gem_file}"
+end
+
+# Build the Gem and move it under the pkg directory
+task :build_pkg => :gemspec do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
-end
+end

data/bin/hyla

@@ -18,8 +18,8 @@ program :description, Hyla::DESCRIPTION
 default_command :default
 
 def add_build_options(c)
-  c.option '-c','--config CONFIG_FILE', String, 'Custom configuration file'
-  c.option '-V','--verbose', 'Print verbose output.'
+  c.option '-c', '--config CONFIG_FILE', String, 'Custom configuration file'
+  c.option '-V', '--verbose', 'Print verbose output.'
 end
 
 def add_common_options(c)
@@ -28,26 +28,31 @@ def add_common_options(c)
 end
 
 #
-# Creates a new Hyla project using a template or blank to the PATH specified
+# Creates a new Hyla project using a template which is a collection of asciidoctor files
+# or create a blank project to the PATH specified as argument on the command line
 #
 command :new do |c|
-  c.syntax = 'hyla new [options]'
+  c.syntax = 'hyla new [options] <PATH>'
   c.description = 'Creates a new Hyla project using a template or blank to the PATH specified'
-  c.option '-f','--force', 'Force creation even if PATH already exists'
-  c.option '-b','--blank', 'Creates project but with empty files'
-  c.option '--t','--template_type [TEMPLATE_TYPE]', String, 'Template Type to be used (documentation, book, training, training-exercises, blog, web, ...)'
+  c.description = 'Example : hyla new -b /path/to/myProject'
+  c.option '-f', '--force', 'Force creation even if PATH already exists'
+  c.option '-b', '--blank', 'Creates project directory containing the YAML config file and a simple readme.ad file'
+  c.option '--t', '--template_type [TEMPLATE_TYPE]', String, 'Template Type to be used (documentation, book, training, training-exercises, blog, web, ...)'
 
-  add_common_options(c)
-  add_build_options(c)
+  c.option '-V', '--verbose', 'Print verbose output.'
 
   c.action do |args, options|
-    config = Hyla::Configuration.parse(options.__hash__)
-    Hyla::Commands::New.process(args, config)
+    if args.first.nil?
+      puts "Please specify the PATH where the project should be created."
+    else
+      config = Hyla::Configuration.parse(options.__hash__)
+      Hyla::Commands::New.process(args, config)
+    end
   end
 end
 
 #
-# Creates a new file from an artefact within an existing project
+# Creates a new file from an artifact within an existing project
 #
 command :add do |c|
   c.syntax = 'hyla add [options]'

data/documentation/developer.adoc

@@ -0,0 +1,49 @@
+:homepage: http://github.com/cmoulliard/hyla
+:docs: https://github.com/cmoulliard/hyla/blob/master/documentation/introduction.adoc
+:sources: https://github.com/cmoulliard/hyla
+:issues: https://github.com/cmoulliard/hyla/issues/
+
+== Install the gem
+
+Use `gem install` command to deploy Hyla :
+
+    $ gem install hyla -y
+
+NOTE :  The option `-y` will tell to rubyGems to deploy the gem but also the dependencies required
+
+== Build the project from the code 
+
+* Generate the gem
+
+In order to build the Hyla project, we recommend that you clone the project locally (or fork it) {sources}[from the Hyla git repository], next you move to the project cloned
+and finally, run the following command :
+    
+    rake build
+
+This command will create a gem of the project
+
+* To install theGem to your machine, run this command
+
+    rake install
+    
+* If you would like to change the scss files, styles and regenerate the css, use this command
+    
+    rake compass
+
+* To publish the gem to the RubyGems Web Server, use this command
+
+    rake deploy
+
+* To create a release, generate a tagged release and publish it to Gem Repo
+
+    rake install
+    git commit -m "Release Hyla 1.0.7.pre.x" -a
+    git push
+    git tag -a hyla-1.0.7.pre.x -m "Release hyla 1.0.7.pre.x"
+    git push origin hyla-1.0.7.pre.x
+
+    rake deploy
+    
+* To delete a release pushed to RubyGems (= yank)
+
+    gem yank hyla -v 1.0.x

data/documentation/introduction.adoc

@@ -39,56 +39,11 @@ hyla will include 'awestruct'
 
 The Hyla project name comes from an arboreal http://en.wikipedia.org/wiki/Hyla[frog] living in equatorial regions of Europe, Asia or Americas. Its name was inspired by the companion of Hercule (Hylas) in Greek mythology.
 
-== Prerequisites
+== Developer
 
-- https://github.com/sstephenson/ruby-build#readme[rbenv-build] which let you to deploy a pre-compiled version of Ruby
-- https://github.com/sstephenson/rbenv[rbenv] to manage different versions of Ruby
-- https://www.ruby-lang.org/en/[Ruby] 1.9.3-p484
-- http://guides.rubygems.org/[RubyGems] to install Ruby Applications
-- http://feedback.livereload.com/knowledgebase/articles/86242-how-do-i-install-and-use-the-browser-extensions-[How do I install and use the browser extensions for LiveReload].
-Be sure to enable the option “Allow access to file URLs” checkbox in Tools > Extensions > LiveReload after installation of Chrome Extension.
-
-image::image/access_local_file.png[Access Local File,650,150]
-
-== Dependencies
-
-- https://github.com/hakimel/reveal.js[RevealJS] - Version 2.6.1
-
-== Installation
-
-Use `gem install` command to deploy Hyla :
-
-    $ gem install hyla -y -v 1.0.x
-
-NOTE : The option `-y` will tell to rubyGems to deploy the gem but also the dependencies required
-
-NOTE : The option `-v` tells to gem installer to deploy a specific version / release. The release number will depend on the version available (1.0.1, 1.0.2, ...)
-
-An alternative is to create a Gemfile and add this line :
-
-    gem 'hyla'
-
-And then execute:
-
-    $ bundle
-
-**Or** install it yourself as:
-
-    $ gem install hyla -v _version_
-
-where _version_ should be 1.0.2, 1.0.x
-
-== For Developer's only
-
-    Clone Git project locally, move to Hyla directory and execute the following commands
-    gem build hyla.gemspec
-    gem install hyla-1.0.x -l
-
-== To publish Hyla to Gem Repo
-
-    gem build hyla.gemspec
-    gem install hyla-1.0.x.gem -l
-    gem push hyla-1.0.x.gem
+* link:documentation/prerequisites.adoc[Prerequisites]
+* link:documentation/developer.adoc["How to install, build the gem"]
+* Using a Docker container
 
 == Usage
 

data/documentation/prerequisites.adoc

@@ -0,0 +1,8 @@
+== Prerequisites
+
+- https://github.com/sstephenson/ruby-build#readme[rbenv-build] which let you to deploy a pre-compiled version of Ruby
+- https://github.com/sstephenson/rbenv[rbenv] to manage different versions of Ruby
+- https://www.ruby-lang.org/en/[Ruby] 1.9.3-p484
+- http://guides.rubygems.org/[RubyGems] to install Ruby Applications
+- http://feedback.livereload.com/knowledgebase/articles/86242-how-do-i-install-and-use-the-browser-extensions-[How do I install and use the browser extensions for LiveReload].
+Be sure to enable the option “Allow access to file URLs” checkbox in Tools > Extensions > LiveReload after installation of Chrome Extension.

data/hyla.gemspec

@@ -6,7 +6,7 @@ require 'hyla/project'
 Gem::Specification.new do |s|
   s.name          = 'hyla'
   s.version       = Hyla::VERSION
-  s.authors       = ["Charles Mouliard"]
+  s.authors       = ["Charles Moulliard"]
   s.email         = ["ch007m@gmail.com"]
   s.description   = Hyla::DESCRIPTION
   s.summary       = Hyla::SUMMARY
@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~> 1.5'
   s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'font-awesome-sass','~> 4.3'
+  s.add_development_dependency 'compass', '~> 1.0'
+  s.add_development_dependency 'sass', '~> 3.4'
 
   #  Ruby command-line executables
   # Add pry before

data/lib/hyla/commands/generate.rb

@@ -224,14 +224,14 @@ module Hyla
           Hyla.logger.debug ">>       Relative path: #{relative_path}"
           adoc_file_paths << relative_path
 
-          # Get asciidoc file name
+          # Get asciidoctor file name
           file_name_processed = path_to_adoc_file.basename
 
           #
           # Create destination dir relative to the path calculated
           #
-          html_dir = @destination + '/' + File.dirname(relative_path)
-          Hyla.logger.info ">>        Dir of html: #{html_dir}"
+          html_dir = [@destination, File.dirname(relative_path)] * '/'
+          Hyla.logger.debug ">>        Dir of html: #{html_dir}"
           FileUtils.mkdir_p html_dir
 
           # Copy Fonts
@@ -299,9 +299,11 @@ module Hyla
       #
       # Copy resources to target dir
       def self.cp_resources_to_dir(path, resource)
-        source = [Configuration::resources, resource] * '/'
-        destination = [path, resource] * '/'
-        FileUtils.cp_r source, destination
+        source = [Configuration::assets, resource] * '/'
+        # destination = [path, resource] * '/'
+        destination = path
+        Hyla.logger.debug ">>        Copy resource from Source dir: #{source} --> destination dir: #{destination}"
+        FileUtils.cp_r source, destination, :verbose => false
       end
 
       #