oleg 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1959ad4dcb10af988cca489723033a91a9ff9dd5
-  data.tar.gz: a376caa659e4830dfc91ad8137ef62f752a6ecd4
+  metadata.gz: 7e4f90f727a10550fe24d3d8a9f97c8c05dd38b5
+  data.tar.gz: 98368a97bdfb2e8bc5709ae44e14bb41b72f6f40
 SHA512:
-  metadata.gz: 4b20e1e39fe317138b9b6d61156026c59b6836984f7046239b71a422745463a820207b5436fbc15feb175de31801e21b27b07b158b4f56ba956adf8c75e4a8ad
-  data.tar.gz: 4dbeceee4d089a6e7e16bd2d0cd0281b2f1e8a34760a81d62c79f26d4d50630446e5fda29efb03a1114aa03bb40d3294b580ae561851da918251327dbfa3f04e
+  metadata.gz: 1aa44cfd06b459245ae6c0e76ab8da5e80c9d9d8927f6dc378e61f50dad04b18c9837c6d1ad44b911589f3c5c8e94b847e17edaf8062616a88466b16676cea45
+  data.tar.gz: f45af9fcada0e077125787f8c78fb84dbe405cd801950819b41479dae1da874bb7d26ea7c37dab5ac815424f7002884433092489cde45514c575c7d5eaa1830f

data/lib/leg/commands/base_command.rb

@@ -36,7 +36,7 @@ class Leg::Commands::BaseCommand
     @steps ||= Dir[File.join(@config[:path], "*")].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) }
+    end.compact.sort_by { |s| s.split(".").map(&:to_i) }.reject { |s| s.to_i.zero? }
   end
 
   def current_step
@@ -53,6 +53,13 @@ class Leg::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], step)
   end

data/lib/leg/commands/diff.rb

@@ -0,0 +1,42 @@
+class Leg::Commands::Diff < Leg::Commands::BaseCommand
+  def self.name
+    "diff"
+  end
+
+  def self.summary
+    "Convert repo into a single file containing diffs for each step"
+  end
+
+  def run
+    needs! :config
+
+    if !File.exist?(File.join(@config[:path], "repo"))
+      puts "Error: Not in repo mode!"
+      exit!
+    end
+
+    FileUtils.cd(File.join(@config[:path], "repo")) do
+      patches = `git format-patch --stdout -p --no-signature --root master`
+      File.open("../steps.diff", "w") do |f|
+        step_num = 1
+        patches.each_line do |line|
+          if line =~ /^(From|Date)/
+            # skip
+          elsif line =~ /^Subject: \[[^\]]*\] (.*)$/
+            f << "\n" unless step_num == 1
+            parts = $1.split('-')
+            if parts.length >= 2
+              f << "~~~ step: #{parts[1..-1].join('-')}\n"
+            else
+              f << "~~~ step\n"
+            end
+            step_num += 1
+          elsif line.chomp.length > 0
+            f << line
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/leg/commands/undiff.rb

@@ -0,0 +1,70 @@
+class Leg::Commands::Undiff < Leg::Commands::BaseCommand
+  def self.name
+    "undiff"
+  end
+
+  def self.summary
+    "Conver steps.diff to step folders"
+  end
+
+  def run
+    needs! :config
+
+    FileUtils.cd(@config[:path]) do
+      if !File.exist?("steps.diff")
+        puts "Error: steps.diff doesn't exist!"
+        exit!
+      end
+
+      if !steps.empty?
+        puts "Error: Step folders already exist!"
+        exit!
+      end
+
+      if File.exist?("repo")
+        puts "Error: In repo mode!"
+        exit!
+      end
+
+      File.open("steps.diff", "r") do |f|
+        step_num = 0
+        step_dir = nil
+        prev_dir = nil
+        cur_diff = nil
+        while line = f.gets
+          if line =~ /^~~~ step(: \w+(-\w+)*)?$/
+            if cur_diff
+              apply_diff(step_dir, 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)
+            else
+              FileUtils.cp_r(prev_dir, step_dir)
+            end
+            prev_dir = step_dir
+          elsif line =~ /^diff --git/
+            apply_diff(step_dir, 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
+      end
+    end
+  end
+
+  private
+
+  def apply_diff(dir, diff)
+    stdin = IO.popen("git --git-dir= apply --directory=#{dir} -", "w")
+    stdin.write diff
+    stdin.close
+  end
+end
+

data/lib/leg/commands.rb

@@ -4,8 +4,10 @@ end
 
 require 'leg/commands/base_command'
 
+require 'leg/commands/diff'
 require 'leg/commands/help'
 require 'leg/commands/pieces'
 require 'leg/commands/repo'
+require 'leg/commands/undiff'
 require 'leg/commands/unrepo'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oleg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jeremy Ruten
@@ -36,9 +36,11 @@ files:
 - lib/leg/cli.rb
 - lib/leg/commands.rb
 - lib/leg/commands/base_command.rb
+- lib/leg/commands/diff.rb
 - lib/leg/commands/help.rb
 - lib/leg/commands/pieces.rb
 - lib/leg/commands/repo.rb
+- lib/leg/commands/undiff.rb
 - lib/leg/commands/unrepo.rb
 homepage: https://github.com/yjerem/leg
 licenses: