snaptoken 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 786cbd31e529a228b77a591237e1b43a0b64424e
-  data.tar.gz: 92ed1c09c7e9bc60f10c6ca20dd2e69a47370cc9
+  metadata.gz: 6b7019ae6a9665013d03b3377750af5879bfa4ec
+  data.tar.gz: 39193a2e3bd1e88f24313e075b061da0cdc6bda0
 SHA512:
-  metadata.gz: ab86847bef210f8b8462a6e152188d512e8cc3872d82178a4dc23b98e76fc75a4495a2a681a64077f5c912687b0b2e69c79317ea4e9f428b93a745404f453d10
-  data.tar.gz: 14896c6ba8d42520d098b09ca2d62c4a2207ea1cb9e54cbf43c479d0c9d702f1358ffd3595f4a407c953b6a4d64a20c8c775dbd16345f14c8181f235d5f094fd
+  metadata.gz: a5da6724aa5aa4a7d7ded49658fb4cd0ee59996443312a46243b01bcb36d2c004eb2f84b851fde4d01f8ad38a6f2c4fe607a26f4108f62338601798bdb1978ce
+  data.tar.gz: 84dac34cc1d79540920043e3edcd1ca71b8dd3ccddd704c1a2384696bb7d8478606215782fc47b0a45bd224cbfb3ef99d3e3759ee6f87229e1726e89366c8ff4

data/lib/snaptoken/commands/base_command.rb

@@ -91,14 +91,13 @@ class Snaptoken::Commands::BaseCommand
 
   def steps
     @steps ||= Dir[File.join(@config[:path], "steps/*")].map do |f|
-      name = File.basename(f)
-      name if File.directory?(f) && name =~ /\A\d+(\.\d+)*(-\w+)*\z/
-    end.compact.sort_by { |s| s.split(".").map(&:to_i) }.reject { |s| s.to_i.zero? }
+      Snaptoken::Step.from_folder_name(File.basename(f)) if File.directory?(f)
+    end.compact.sort_by(&:number)
   end
 
   def current_step
     if @config[:step_path]
-      File.basename(@config[:step_path])
+      Snaptoken::Step.from_folder_name(File.basename(@config[:step_path]))
     end
   end
 
@@ -110,19 +109,12 @@ class Snaptoken::Commands::BaseCommand
     current_step || latest_step
   end
 
-  def step_name(step)
-    parts = step.split('-')
-    if parts.length > 1
-      parts[1..-1].join('-')
-    end
-  end
-
   def step_path(step)
-    File.join(@config[:path], "steps", step)
+    File.join(@config[:path], "steps", step.folder_name)
   end
 
   def select_step(step, &block)
-    puts "Selecting step: #{step}"
+    puts "Selecting step: #{step.folder_name}"
     FileUtils.cd(step_path(step), &block)
   end
 end

data/lib/snaptoken/commands/diff.rb

@@ -19,12 +19,8 @@ class Snaptoken::Commands::Diff < Snaptoken::Commands::BaseCommand
             # skip
           elsif line =~ /^Subject: \[[^\]]*\](.*)$/
             f << "\n" unless step_num == 1
-            step_name = $1.strip
-            if step_name =~ /^\w+(-\w+)*$/
-              f << "~~~ step: #{step_name}\n"
-            else
-              f << "~~~ step\n"
-            end
+            step = Snaptoken::Step.from_commit_msg(step_num, $1.strip)
+            f << "~~~ step: #{step.commit_msg}\n"
             step_num += 1
           elsif line.chomp.length > 0
             f << line

data/lib/snaptoken/commands/doc.rb

@@ -72,19 +72,13 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
     diffs = {}
     FileUtils.cd("../steps") do
       FileUtils.mkdir_p("0")
-      last_step = "0"
-      Dir["*"].sort_by(&:to_i).each do |step|
-        print "\r\e[K#{step}"
-        names = [step.to_i.to_s]
-        if step =~ /\d+\-([\w-]+)$/
-          names << $1
-        end
+      last_step = Snaptoken::Step.new(0, nil, [])
+      steps.each do |step|
+        print "\r\e[K#{step.folder_name}"
 
         diff = Snaptoken::Diff.new(@config, last_step, step)
 
-        names.each do |name|
-          diffs[name] = diff.html.values.join("\n")
-        end
+        diffs[step.name] = diff.html.values.join("\n")
 
         last_step = step
       end

data/lib/snaptoken/commands/ref.rb

@@ -20,10 +20,9 @@ class Snaptoken::Commands::Ref < Snaptoken::Commands::BaseCommand
       walker.sorting(Rugged::SORT_TOPO | Rugged::SORT_REVERSE)
       walker.push(repo.branches.find { |b| b.name == "master" }.target)
       walker.each.with_index do |commit, idx|
-        step_num = (idx + 1).to_s
-        step_name = commit.message.lines.first.strip
+        step = Snaptoken::Step.from_commit_msg(idx + 1, commit.message.lines.first.strip)
 
-        if (is_num && ref == step_num) || (!is_num && ref == step_name)
+        if (is_num && ref.to_i == step.number) || (!is_num && ref == step.name)
           puts commit.oid
           exit
         end

data/lib/snaptoken/commands/repo.rb

@@ -30,14 +30,14 @@ class Snaptoken::Commands::Repo < Snaptoken::Commands::BaseCommand
 
       options = {}
       options[:tree] = index.write_tree(repo)
-      options[:message] = step_name(step) || "-"
+      options[:message] = step.commit_msg
       options[:parents] = repo.empty? ? [] : [repo.head.target]
       options[:update_ref] = 'HEAD'
 
       commit_oid = Rugged::Commit.create(repo, options)
 
-      if step_name(step)
-        repo.references.create("refs/tags/#{step_name(step)}", commit_oid)
+      if step.name
+        repo.references.create("refs/tags/#{step.name}", commit_oid)
       end
     end
 

data/lib/snaptoken/commands/undiff.rb

@@ -15,33 +15,32 @@ class Snaptoken::Commands::Undiff < Snaptoken::Commands::BaseCommand
       FileUtils.cd("steps") do
         File.open("../steps.diff", "r") do |f|
           step_num = 0
-          step_dir = nil
-          prev_dir = nil
+          step = Snaptoken::Step.new(0, nil, [])
+          prev_step = nil
           cur_diff = nil
           while line = f.gets
-            if line =~ /^~~~ step(: \w+(-\w+)*)?$/
+            if line =~ /^~~~ step: ([\s\w-]+)$/
               if cur_diff
-                apply_diff(step_dir, cur_diff)
+                apply_diff(step, cur_diff)
                 cur_diff = nil
               end
 
-              step_num += 1
-              step_dir = step_num.to_s
-              step_dir += "-#{$1[2..-1]}" if $1
-              if step_num == 1
-                FileUtils.mkdir(step_dir)
+              prev_step = step
+              step = Snaptoken::Step.from_commit_msg(prev_step.number + 1, $1)
+
+              if step.number == 1
+                FileUtils.mkdir(step.folder_name)
               else
-                FileUtils.cp_r(prev_dir, step_dir)
+                FileUtils.cp_r(prev_step.folder_name, step.folder_name)
               end
-              prev_dir = step_dir
             elsif line =~ /^diff --git/
-              apply_diff(step_dir, cur_diff) if cur_diff
+              apply_diff(step, cur_diff) if cur_diff
               cur_diff = line
             elsif cur_diff
               cur_diff << line
             end
           end
-          apply_diff(step_dir, cur_diff) if cur_diff
+          apply_diff(step, cur_diff) if cur_diff
         end
       end
     end
@@ -49,8 +48,8 @@ class Snaptoken::Commands::Undiff < Snaptoken::Commands::BaseCommand
 
   private
 
-  def apply_diff(dir, diff)
-    stdin = IO.popen("git --git-dir= apply --directory=#{dir} -", "w")
+  def apply_diff(step, diff)
+    stdin = IO.popen("git --git-dir= apply \"--directory=#{step.folder_name}\" -", "w")
     stdin.write diff
     stdin.close
   end

data/lib/snaptoken/commands/unrepo.rb

@@ -19,14 +19,7 @@ class Snaptoken::Commands::Unrepo < Snaptoken::Commands::BaseCommand
       walker.sorting(Rugged::SORT_TOPO | Rugged::SORT_REVERSE)
       walker.push(repo.branches.find { |b| b.name == "master" }.target)
       walker.each.with_index do |commit, idx|
-        step_num = (idx + 1).to_s
-        step_name = commit.message.lines.first.strip
-
-        if step_name.empty?
-          step = step_num
-        else
-          step = "#{step_num}-#{step_name}"
-        end
+        step = Snaptoken::Step.from_commit_msg(idx + 1, commit.message.lines.first.strip)
 
         repo.checkout(commit.oid, strategy: :force,
                                   target_directory: step_path(step))

data/lib/snaptoken/diff.rb

@@ -1,20 +1,17 @@
 class Snaptoken::Diff
+  # -r for recursive?
   GIT_DIFF_OPTIONS = "--histogram --unified=100000 --ignore-space-change --no-index"
 
   attr_reader :files, :html
 
   def initialize(config, step_a, step_b)
-    git_diff = `git diff #{GIT_DIFF_OPTIONS} #{step_a} #{step_b}`
+    git_diff = `git diff #{GIT_DIFF_OPTIONS} #{step_a.folder_name} #{step_b.folder_name}`
     parse_git_diff(git_diff)
     @files.values.each(&:omit_adjacent_removals!)
 
-    step = step_b.split('-')
-    step.shift
-    step = step.join('-')
-
     @html = {}
     @files.each do |filename, file|
-      @html[filename] = file.to_html(config[:name], step)
+      @html[filename] = file.to_html(config[:name], step_b)
     end
   end
 
@@ -109,7 +106,7 @@ class Snaptoken::Diff
 
       html = ""
       html << "<div class=\"diff\">\n"
-      html << "<div class=\"filename\"><a href=\"https://github.com/snaptoken/#{project}/blob/#{step}/#{@filename}\">#{@filename}</a></div>\n"
+      html << "<div class=\"filename\"><a href=\"https://github.com/snaptoken/#{project}/blob/#{step.name}/#{@filename}\">#{@filename}</a></div>\n"
       html << "<pre class=\"highlight\"><code>"
 
       to_render = @contents.dup

data/lib/snaptoken/step.rb

@@ -0,0 +1,35 @@
+class Snaptoken::Step
+  attr_accessor :number, :name, :data
+
+  def initialize(number, name, data)
+    @number, @name, @data = number, name, data
+  end
+
+  def folder_name
+    name = "#{@number}"
+    name << "-#{@name}" if @name
+    name << "+#{@data.join('+')}" if @data.length > 0
+    name
+  end
+
+  def commit_msg
+    if @data.empty?
+      @name
+    else
+      "#{@name} #{@data.join(' ')}"
+    end
+  end
+
+  def self.from_folder_name(folder)
+    if folder =~ /\A(\d+)-([\w-]+)(\+([\+\w-]*))?\z/
+      Snaptoken::Step.new($1.to_i, $2, $4.to_s.split('+'))
+    end
+  end
+
+  def self.from_commit_msg(number, msg)
+    if msg =~ /\A([\w-]+)(\s([\s\w-]*))?\z/
+      Snaptoken::Step.new(number, $1, $2.to_s.split)
+    end
+  end
+end
+

data/lib/snaptoken.rb

@@ -11,4 +11,5 @@ end
 require 'snaptoken/cli'
 require 'snaptoken/commands'
 require 'snaptoken/diff'
+require 'snaptoken/step'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snaptoken
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -75,6 +75,7 @@ files:
 - lib/snaptoken/commands/undiff.rb
 - lib/snaptoken/commands/unrepo.rb
 - lib/snaptoken/diff.rb
+- lib/snaptoken/step.rb
 homepage: https://github.com/yjerem/leg
 licenses:
 - MIT