snaptoken 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe965284492ad49b9d3bebd2b91e34c2c8500ab
-  data.tar.gz: d437d4a1291efa2e02012fec122f0a7c4bb3a923
+  metadata.gz: 5732a03e103535a0b8cc6bb03fdd9d3f8e0e51ac
+  data.tar.gz: 109ad0fdef8fef34e41c8e4d3650e07926daa4e4
 SHA512:
-  metadata.gz: 0b8628f7ec5d77ec35c810cb27b0361da74bf4d007ba38f9e6ea0011bb562492c82e5c993965f07ea55d131fb5ee0ab9294cec866e37200185031bf7250f507b
-  data.tar.gz: df1904475d297fb6ee708a2a173a30e0738a497f17b3c9c6ee30fdc94f08ef2a153472826b0f1f78b75f0027d2e9984d4c1c694d65809c87bb4e023e67b2fe7e
+  metadata.gz: fb0722a5833263147c8bbf89c13b506829e6e963497136411348de04487f2fafdd1bf00a01f71a96b520abfa46ba68638b7a33c335e5f4743bbeb8e0f2fecc81
+  data.tar.gz: e4fcbe58bac981544cfb8181161f2ac1d0653ef1828067e07efd6273f031e0a6bfe86af365e5220f60f45133850ce2a399b05f1c46baa5136f3f6e1352d9fa08

data/lib/snaptoken/cli.rb

@@ -9,10 +9,11 @@ class Snaptoken::CLI
     while FileUtils.pwd != last_dir
       if File.exist?(CONFIG_FILE)
         @config = YAML.load(File.read(CONFIG_FILE))
-        unless @config.is_a? Hash
+        if @config == false
           puts "Error: Invalid config file."
           exit!
         end
+        @config = {} unless @config.is_a?(Hash)
         @config[:path] = FileUtils.pwd
         @config[:step_path] = last_dir2
         @config[:orig_path] = initial_dir

data/lib/snaptoken/commands/base_command.rb

@@ -17,12 +17,6 @@ class Snaptoken::Commands::BaseCommand
       true: "You are not in a leg working directory.",
       false: "You are already in a leg working directory."
     },
-    config_name: {
-      true: "You need to set a name in leg.yml."
-    },
-    config_title: {
-      true: "You need to set a title in leg.yml."
-    },
     steps_folder: {
       true: "There is no steps folder.",
       false: "There is already a steps folder."
@@ -60,10 +54,6 @@ class Snaptoken::Commands::BaseCommand
       case what
       when :config
         valid = true if @config
-      when :config_name
-        valid = true if @config[:name]
-      when :config_title
-        valid = true if @config[:title]
       when :steps_folder
         valid = true if File.exist?(File.join(@config[:path], "steps"))
       when :steps

data/lib/snaptoken/commands/doc.rb

@@ -8,7 +8,7 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
   end
 
   def run
-    needs! :config, :config_name, :config_title, :steps_folder, :steps, :doc
+    needs! :config, :steps_folder, :steps, :doc
 
     FileUtils.cd(File.join(@config[:path], "doc")) do
       FileUtils.rm_rf("html_out")
@@ -135,7 +135,7 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
       html = html_template.dup
     end
 
-    html.gsub!("{{title}}") { "Table of contents | #{@config[:title]}" }
+    html.gsub!("{{title}}") { @config[:title] }
     html.gsub!("{{prev_link}}") { "<a href='#'></a>" }
     html.gsub!("{{next_link}}") { "<a href='#{pages.first}.html'>next &rarr;</a>" }
     html.gsub!("{{version}}") { @config[:version] }
@@ -146,7 +146,7 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
   end
 
   def create_archive
-    name = "kilo-tutorial-#{@config[:version]}"
+    name = "#{@config[:name]}-tutorial-#{@config[:version]}"
 
     FileUtils.mv("html_offline", name)
 

data/lib/snaptoken/diff.rb

@@ -101,7 +101,7 @@ class Snaptoken::Diff
       formatter = Rouge::Formatters::HTML.new
       formatter = HTMLLineByLine.new(formatter)
 
-      lexer = Rouge::Lexer.guess(filename: @filename)
+      lexer = Rouge::Lexer.guess(filename: @filename, source: @file_contents)
       code_hl = formatter.format(lexer.lex(@file_contents)).lines.each(&:chomp!)
 
       html = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snaptoken
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged