snaptoken 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8904d0bdce5a73db3795d42eddea18618930fb
-  data.tar.gz: 580aa6514165807bea0d89475364d8b7d351cbff
+  metadata.gz: ecc91e0a30895dd4821e2da35602b38a8d5d68cf
+  data.tar.gz: 74ae9e091a3c50452c5421c8873b51993942fb3d
 SHA512:
-  metadata.gz: d1149aeee348e9bebe74a60320c6b91ca4003e8a1cf27ee7ccdeed905a540e69c75c260b03bae49d26169c1ccf7488d3820dce8e5f871f660e68030a5f7b12fd
-  data.tar.gz: b9053d36ac5e378fa3dc4f0a1a3ef589fa1344bbdbba0210f10c34a6a78aa8b87a9383729b73bc0631ff2970c78ccf8476add0ee846912d9626b7c5cf795bace
+  metadata.gz: c40cad24f4935310d55101d30ea6b84037e5393b96c38b7b9448bd5231ad65e724f170bc2a63dcaf9289ab71b2875990e440317127c33cd7914aa5c5b5d2431d
+  data.tar.gz: 66c826b887014796a835bf0fb1c8095e79b5087f787505a1795e5757700a18b97d5cafc7e4c28fb88f52373fa05aa330c7c37cc1781d28b331c02f759867b380

data/lib/snaptoken/commands/diff.rb

@@ -18,6 +18,7 @@ class Snaptoken::Commands::Diff < Snaptoken::Commands::BaseCommand
           if line =~ /^(From|Date|index)/
             # skip
           elsif line =~ /^Subject: \[[^\]]*\](.*)$/
+            break if $1.strip == "-"
             f << "\n" unless step_num == 1
             step = Snaptoken::Step.from_commit_msg(step_num, $1.strip)
             f << "~~~ step: #{step.commit_msg}\n"

data/lib/snaptoken/commands/repo.rb

@@ -16,10 +16,28 @@ class Snaptoken::Commands::Repo < Snaptoken::Commands::BaseCommand
     repo = Rugged::Repository.init_at("repo")
 
     steps.each do |step|
-      index = repo.index
-      index.read_tree(repo.head.target.tree) unless repo.empty?
+      commit_oid = add_commit(repo, step, step_path(step))
 
-      FileUtils.cd(step_path(step)) do
+      if step.name
+        repo.references.create("refs/tags/#{step.name}", commit_oid)
+      end
+    end
+
+    if Dir.exist? "repo-extra"
+      add_commit(repo, nil, [step_path(latest_step), "repo-extra"])
+    end
+
+    repo.checkout_head(strategy: :force)
+  end
+
+  private
+
+  def add_commit(repo, step, add_paths)
+    index = repo.index
+    index.read_tree(repo.head.target.tree) unless repo.empty?
+
+    Array(add_paths).each do |add_path|
+      FileUtils.cd(add_path) do
         Dir["**/*"].each do |path|
           unless File.directory?(path)
             oid = repo.write(File.read(path), :blob)
@@ -27,21 +45,15 @@ class Snaptoken::Commands::Repo < Snaptoken::Commands::BaseCommand
           end
         end
       end
-
-      options = {}
-      options[:tree] = index.write_tree(repo)
-      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
-        repo.references.create("refs/tags/#{step.name}", commit_oid)
-      end
     end
 
-    repo.checkout_head(strategy: :force)
+    options = {}
+    options[:tree] = index.write_tree(repo)
+    options[:message] = step ? step.commit_msg : "-"
+    options[:parents] = repo.empty? ? [] : [repo.head.target]
+    options[:update_ref] = 'HEAD'
+
+    Rugged::Commit.create(repo, options)
   end
 end
 

data/lib/snaptoken/commands/unrepo.rb

@@ -19,6 +19,8 @@ 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|
+        break if commit.message.lines.first.strip == "-"
+
         step = Snaptoken::Step.from_commit_msg(idx + 1, commit.message.lines.first.strip)
 
         repo.checkout(commit.oid, strategy: :force,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snaptoken
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged