gibier 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00f5bdac3730dd442ad8fe108003c6db327e107
-  data.tar.gz: f196ced7e35638f7533960c59f89d461da948f49
+  metadata.gz: 38d858f7b0797998854b3948a5f04e4d06793438
+  data.tar.gz: 18c72c61d148fc0309fbfeff8497e108b35641e4
 SHA512:
-  metadata.gz: 0cd79515cd3d9ca76dd09cf1d00743aeb32c37eabd9e651b83e0bcf28e94c447970235b0132d381bd7a6e7ff77153f8fee79fba2cb35deec2c282bf6987990ba
-  data.tar.gz: dcf24093e83d5f3baf9004b3e0b477e9acfd088389473af568405db5907e53b774bcc86a4c243918596923c0dfe552d28ac16278b192e2b7da669cdec8ad9850
+  metadata.gz: 28a86fe0833d769463df42b946d2cd89e73f36b2a027bbbf5e82d9b48844b94aff9b3932205b871a9dbb2bf2d0bcb8cb7aeaf4383edf2939e363692c526caec8
+  data.tar.gz: ea91ba9ad40833a4d1f5979e65b9f06b63860c3eb743f97a53ad5b92218fa7a8f43dba756afe5a806d6d91533b618e7139ad82891f7f3707949d5e7de157069b

data/lib/gibier/cli.rb

@@ -4,10 +4,14 @@ require 'pathname'
 require 'rouge'
 require 'opal'
 require 'haml'
+require 'gibier/haml_helper'
+require 'gibier/static_generator'
 
 module Gibier
   class Cli < Thor
-    desc 'new', 'create new project'
+    include HamlHelper
+
+    desc 'new', 'Create new project'
 
     def new(name)
       puts "Create new project '#{name}'"
@@ -20,76 +24,32 @@ module Gibier
       end
     end
 
-    desc 'highlight', 'generate highlight.css'
+    desc 'highlight', 'Generate highlight.css'
 
     def highlight
       puts Rouge::Themes::Base16.mode(:dark).render(scope: '.highlight')
     end
 
-    desc 'ghpages', 'create static pages'
-
-    def ghpages
-      puts "Create static pages"
+    desc 'static', 'Create Static Pages'
+    option :name, type: :string, aliases: '-n', desc: 'Specify slide name'
+    option :dir, type: :string, aliases: '-d', desc: 'Specify target directory'
+    def static
+      puts "Create Static Pages"
 
-      FileUtils.mkdir_p 'docs'
+      target_dir = options[:dir] || 'docs'
+      FileUtils.mkdir_p target_dir
       assets_dir = Dir.new(__dir__ + '/../../template/project/assets')
-      FileUtils.cp_r(assets_dir.path, 'docs')
-
-      slide_loader = Gibier::SlideLoader.new
-      Gibier::SlideHelper.each_slides('data') do |name|
-        slide_loader.init_slide(name)
-
-        FileUtils.mkdir_p "docs/assets/#{name}"
-        FileUtils.cp_r("data/#{name}/css", "docs/assets/#{name}")
-        FileUtils.cp_r("data/#{name}/images", "docs/assets/#{name}")
-
-        FileUtils.mkdir_p "docs/#{name}"
-        convert_html(File.expand_path('../../../template/gh_pages/slide.haml', __FILE__), "docs/#{name}/index.html", slide_name: name)
-
-        FileUtils.mkdir_p "docs/assets/#{name}/javascripts"
-        build(name, "docs/assets/#{name}/javascripts/application.js")
-      end
-
-      convert_html(File.expand_path('../../../template/gh_pages/index.haml', __FILE__), "docs/index.html", slides: slide_loader.slides)
-    end
+      FileUtils.cp_r(assets_dir.path, target_dir)
 
-    private
-
-    def convert_html(haml_file, html_file, **instance_vars)
-      File.open(html_file, "w") do |f|
-        engine = Haml::Engine.new(File.read(haml_file))
-        context = Object.new
-        instance_vars.each do |key, value|
-          context.instance_variable_set(:"@#{key}", value)
-        end
-        f.write engine.render(context) # Tilt::StringTemplate.new().render
+      generator = StaticGenerator.new('data', target_dir)
+      if options[:name]
+        generator.generate_page(options[:name], 'assets', target_dir)
+      else
+        generator.generate_pages
       end
     end
 
-    def build(name, filename)
-      builder = Opal::Builder.new
-
-      use_gem(builder, 'opal-browser', 'opal')
-      use_gem(builder, 'opal-router', 'opal')
-      use_gem(builder, 'hyalite', 'client')
-
-      builder.append_paths './app'
-      builder.use_gem 'gibier'
-      builder.use_gem 'paggio'
-      builder.build "./app/slides/#{name}/app.rb"
-
-      File.open(filename, 'w') do |file|
-        file.write builder.to_s
-      end
-
-    end
-
-    def use_gem(builder, name, opal_path)
-      spec = Gem::Specification.find_by_name name
-      lib_path = Pathname.new spec.full_require_paths.first
-      opal_path = lib_path.parent + opal_path
-      builder.append_paths opal_path.to_s
-    end
+    map ghpages: :static
   end
 end
 

data/lib/gibier/haml_helper.rb

@@ -0,0 +1,14 @@
+module Gibier
+  module HamlHelper
+    def convert_html(haml_file, html_file, **instance_vars)
+      File.open(html_file, "w") do |f|
+        engine = Haml::Engine.new(File.read(haml_file))
+        context = Object.new
+        instance_vars.each do |key, value|
+          context.instance_variable_set(:"@#{key}", value)
+        end
+        f.write engine.render(context) # Tilt::StringTemplate.new().render
+      end
+    end
+  end
+end

data/lib/gibier/static_generator.rb

@@ -0,0 +1,66 @@
+module Gibier
+  class StaticGenerator
+    include HamlHelper
+
+    def initialize(data_dir, target_dir)
+      @data_dir = data_dir
+      @target_dir = target_dir
+      @slide_loader = Gibier::SlideLoader.new
+    end
+
+    def generate_pages(assets_path = 'assets')
+      Gibier::SlideHelper.each_slides(@data_dir) do |name|
+        generate_page(name, assets_path)
+      end
+
+      convert_html(File.expand_path('../../../template/gh_pages/index.haml', __FILE__), "docs/index.html", slides: @slide_loader.slides)
+    end
+
+    def generate_page(name, assets_path = 'assets', slide_dir = nil)
+      @slide_loader.init_slide(name)
+      src_dir = "#{@data_dir}/#{name}"
+
+      slide_dir =  "#{@target_dir}/#{name}" unless slide_dir
+      FileUtils.mkdir_p slide_dir
+      slide_haml = File.expand_path('../../../template/gh_pages/slide.haml', __FILE__)
+      convert_html(slide_haml, "#{slide_dir}/index.html", slide_name: name, assets_path: assets_path)
+
+      assets_dir = "#{@target_dir}/assets/#{name}"
+      FileUtils.mkdir_p assets_dir
+
+      FileUtils.cp_r("#{src_dir}/css", assets_dir)
+      FileUtils.cp_r("#{src_dir}/images", assets_dir)
+
+      js_dir =  "#{@target_dir}/assets/#{name}/javascripts"
+      FileUtils.mkdir_p js_dir
+      build(name, "#{js_dir}/application.js")
+    end
+
+    private
+
+    def build(name, filename)
+      builder = Opal::Builder.new
+
+      use_gem(builder, 'opal-browser', 'opal')
+      use_gem(builder, 'opal-router', 'opal')
+      use_gem(builder, 'hyalite', 'client')
+
+      builder.append_paths './app'
+      builder.use_gem 'gibier'
+      builder.use_gem 'paggio'
+      builder.build "./app/slides/#{name}/app.rb"
+
+      File.open(filename, 'w') do |file|
+        file.write builder.to_s
+      end
+
+    end
+
+    def use_gem(builder, name, opal_path)
+      spec = Gem::Specification.find_by_name name
+      lib_path = Pathname.new spec.full_require_paths.first
+      opal_path = lib_path.parent + opal_path
+      builder.append_paths opal_path.to_s
+    end
+  end
+end

data/lib/gibier/version.rb

@@ -1,3 +1,3 @@
 module Gibier
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/template/gh_pages/slide.haml

@@ -3,9 +3,9 @@
   %head
     %meta{charset:"utf-8"}
     %title= @slide_name
-    %link{rel:"stylesheet", href:"../assets/css/application.css"}
-    %link{rel:"stylesheet", href:"../assets/#{@slide_name}/css/custom.css"}
-    %link{rel:"stylesheet", href:"../assets/css/highlight.css"}
+    %link{rel:"stylesheet", href:"#{@assets_path}/css/application.css"}
+    %link{rel:"stylesheet", href:"#{@assets_path}/#{@slide_name}/css/custom.css"}
+    %link{rel:"stylesheet", href:"#{@assets_path}/css/highlight.css"}
 
   %body
     %section.gibier
@@ -13,6 +13,6 @@
     :javascript
       window.slideName = '#{@slide_name}'
       window.ghPages = true;
-      window.assetsPath = '../assets/#{@slide_name}';
+      window.assetsPath = '#{@assets_path}/#{@slide_name}';
 
-    %script{type:"text/javascript", src:"../assets/#{@slide_name}/javascripts/application.js"}
+    %script{type:"text/javascript", src:"#{@assets_path}/#{@slide_name}/javascripts/application.js"}

data/template/project/app/slide.rb

@@ -1,5 +1,6 @@
 require 'hyalite'
 require 'opal-router'
+require 'browser'
 require 'browser/interval'
 require 'browser/location'
 require 'track_field'
@@ -97,11 +98,7 @@ module Gibier
     end
 
     def page_to(num)
-      if Gibier.gh_pages
-        $window.location.assign("./##{num}")
-      else
-        $window.location.assign("/#{Gibier.slide_name}##{num}")
-      end
+      $window.location.assign("#{$window.location.to_s.sub(/#\d+$/, '')}##{num}")
     end
 
     def handle_key_down(event)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gibier
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -263,9 +263,11 @@ files:
 - bin/setup
 - lib/gibier.rb
 - lib/gibier/cli.rb
+- lib/gibier/haml_helper.rb
 - lib/gibier/render.rb
 - lib/gibier/slide_helper.rb
 - lib/gibier/slide_loader.rb
+- lib/gibier/static_generator.rb
 - lib/gibier/version.rb
 - template/app.rb
 - template/gh_pages/index.haml