snaptoken 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6525154b59c8cca1e88b42cb2368311fa54332
-  data.tar.gz: 9651c5f3d0fd6c7936498fabe7c39e7f919f2b84
+  metadata.gz: 626846dd7ebd33ca6b903375b605b8474da93fec
+  data.tar.gz: d29d44ce3b90536e8122771b607d947f5ad72576
 SHA512:
-  metadata.gz: 9d6f248e6a9a3e163ec598eda5fc9084e193079f36f0b2b88908d9686eaeffc897ae0dbf5a5343fbfce25bef0d61e69e43d8b43252faabfd536bc35fa8b66af1
-  data.tar.gz: 39140694465988218f57547a027929eaa6173d75a3f3f7fcd2e0fec6cd36c6cd786ef3e3c684356c5998e99fec714496ebaff940d3ecd843d0e9290fe42bc1fa
+  metadata.gz: a2e8893bf535a1ddc43ed101d4b63073fc033a14e5f4ed325ed14ca773fbe5ad98f42eaa65f3cfd625f291ca9e1b1b85d7102e8bfcf4df4d463d86cc5177f3af
+  data.tar.gz: d52c6dc70c08969ade6fbe34f9a47dc9ab904d31906affe7c8878b0a7ece6727d2cce678c6557ae7d35b8c57d172f6b8425dded0b1caa504a162ce3f5006b702

data/lib/snaptoken/cli.rb

@@ -5,7 +5,6 @@ class Snaptoken::CLI
     initial_dir = FileUtils.pwd
 
     last_dir = nil
-    last_dir2 = nil
     while FileUtils.pwd != last_dir
       if File.exist?(CONFIG_FILE)
         @config = YAML.load(File.read(CONFIG_FILE))
@@ -15,12 +14,9 @@ class Snaptoken::CLI
         end
         @config = {} unless @config.is_a?(Hash)
         @config[:path] = FileUtils.pwd
-        @config[:step_path] = last_dir2
-        @config[:orig_path] = initial_dir
         break
       end
 
-      last_dir2 = last_dir
       last_dir = FileUtils.pwd
       FileUtils.cd('..')
     end

data/lib/snaptoken/commands/base_command.rb

@@ -16,7 +16,7 @@ class Snaptoken::Commands::BaseCommand
 
   def parseopts!
     parser = OptionParser.new do |o|
-      o.banner =  "Usage: leg #{self.class.name} #{self.class.usage}"
+      o.banner = "Usage: leg #{self.class.name} #{self.class.usage}"
       self.class.summary.split("\n").each do |line|
         o.separator "    #{line}"
       end
@@ -80,31 +80,31 @@ class Snaptoken::Commands::BaseCommand
     no = Array(options[:not]).map { |w| [w, false] }
 
     (yes + no).each do |what, v|
-      valid = false
-      case what
-      when :config
-        valid = true if @config
-      when :config_sync
-        valid = true if %w(repo steps).include?(@config[:sync])
-      when :steps_folder
-        valid = true if File.exist?(File.join(@config[:path], "steps"))
-      when :steps
-        valid = true if steps.length > 0
-      when :repo
-        valid = true if File.exist?(File.join(@config[:path], "repo"))
-      when :diff
-        valid = true if File.exist?(File.join(@config[:path], "steps.diff"))
-      when :doc
-        valid = true if File.exist?(File.join(@config[:path], "doc"))
-      when :doc_out
-        valid = true if File.exist?(File.join(@config[:path], "doc/html_out"))
-      when :cached_diffs
-        valid = true if File.exist?(File.join(@config[:path], ".cached-diffs"))
-      when :ftp
-        valid = true if File.exist?(File.join(@config[:path], "ftp.yml"))
-      else
-        raise NotImplementedError
-      end
+      valid =
+        case what
+        when :config
+          !!@config
+        when :config_sync
+          %w(repo steps).include?(@config[:sync])
+        when :steps_folder
+          File.exist?(File.join(@config[:path], "steps"))
+        when :steps
+          steps.length > 0
+        when :repo
+          File.exist?(File.join(@config[:path], "repo"))
+        when :diff
+          File.exist?(File.join(@config[:path], "steps.diff"))
+        when :doc
+          File.exist?(File.join(@config[:path], "doc"))
+        when :doc_out
+          File.exist?(File.join(@config[:path], "doc/html_out"))
+        when :cached_diffs
+          File.exist?(File.join(@config[:path], ".cached-diffs"))
+        when :ftp
+          File.exist?(File.join(@config[:path], "ftp.yml"))
+        else
+          raise NotImplementedError
+        end
 
       if valid != v
         puts "Error: " + ERROR_MSG[what][v.to_s.to_sym]
@@ -119,27 +119,12 @@ class Snaptoken::Commands::BaseCommand
     end.compact.sort_by(&:number)
   end
 
-  def current_step
-    if @config[:step_path]
-      Snaptoken::Step.from_folder_name(File.basename(@config[:step_path]))
-    end
-  end
-
   def latest_step
     steps.last
   end
 
-  def current_or_latest_step
-    current_step || latest_step
-  end
-
   def step_path(step)
     File.join(@config[:path], "steps", step.folder_name)
   end
-
-  def select_step(step, &block)
-    puts "Selecting step: #{step.folder_name}"
-    FileUtils.cd(step_path(step), &block)
-  end
 end
 

data/lib/snaptoken/commands/doc.rb

@@ -79,7 +79,7 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
 
     theme_css = theme.render(scope: ".highlight")
     if @config[:bold_weight]
-      theme_css.gsub!("font-weight: bold;", "font-weight: #{@config[:bold_weight]}")
+      theme_css.gsub!("font-weight: bold;", "font-weight: #{@config[:bold_weight]};")
     end
 
     css = File.read("html_in/style.css")
@@ -104,7 +104,6 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
         print "\r\e[K[steps/ -> .cached-diffs] #{step.folder_name}" unless @opts[:quiet]
 
         diff = Snaptoken::Diff.new(@config, last_step, step)
-
         diffs[step.name] = diff.html.values.join("\n")
 
         last_step = step
@@ -145,7 +144,9 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
       content = markdown.render(md)
       content = Redcarpet::Render::SmartyPants.render(content)
       content.gsub!(/<\/code>&lsquo;/) { "</code>&rsquo;" }
-      content.gsub!(/^\s*<h([23456]) id="([^"]+)">(.+)<\/h\d>$/) { "<h#{$1} id=\"#{$2}\"><a href=\"##{$2}\">#{$3}</a></h#{$1}>" }
+      content.gsub!(/^\s*<h([23456]) id="([^"]+)">(.+)<\/h\d>$/) {
+        "<h#{$1} id=\"#{$2}\"><a href=\"##{$2}\">#{$3}</a></h#{$1}>"
+      }
       content.gsub!(/<p>{{([\w-]+)}}<\/p>/) { diffs[$1] }
 
       html = html_template.dup

data/lib/snaptoken/diff.rb

@@ -119,7 +119,7 @@ class Snaptoken::Diff
           if cur.dirty?
             to_render = cur.contents + to_render
           else
-            summary = cur.lines.map { |n| code_hl[n] }.join(" ... ").gsub("\n", "")
+            summary = cur.lines.map { |n| code_hl[n] }.join(" … ").gsub("\n", "")
             html << "<div class=\"line folded\">#{summary}</div>"
           end
         elsif !cur.omit?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snaptoken
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: tools for .leg files