oleg 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4f90f727a10550fe24d3d8a9f97c8c05dd38b5
-  data.tar.gz: 98368a97bdfb2e8bc5709ae44e14bb41b72f6f40
+  metadata.gz: bf4f5f87c6d337bb62e7b3df44db52ec21b28b6d
+  data.tar.gz: 38d29d3088c021488ee771d61093893011964e80
 SHA512:
-  metadata.gz: 1aa44cfd06b459245ae6c0e76ab8da5e80c9d9d8927f6dc378e61f50dad04b18c9837c6d1ad44b911589f3c5c8e94b847e17edaf8062616a88466b16676cea45
-  data.tar.gz: f45af9fcada0e077125787f8c78fb84dbe405cd801950819b41479dae1da874bb7d26ea7c37dab5ac815424f7002884433092489cde45514c575c7d5eaa1830f
+  metadata.gz: a245d260ca274707448ac4f2c3671f46c4cb8b6a57eab49fa68087b9a65ac876cc3c1ff2a651fc9c814a371ef305e2dadf3cc973ca585366fea5dc81d38fb731
+  data.tar.gz: c120b9ab3436791c35bfe5642e050f7005375cd6c95b36f49cc3c29dffa9334bf5b555947dfcff9f113cea243562c78f83cb296e631397a1300d29ce13e3d4ab

data/lib/leg/cli.rb

@@ -5,6 +5,7 @@ class Leg::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))
@@ -13,11 +14,12 @@ class Leg::CLI
           exit!
         end
         @config[:path] = FileUtils.pwd
-        @config[:step_path] = last_dir
+        @config[:step_path] = last_dir2
         @config[:orig_path] = initial_dir
         break
       end
 
+      last_dir2 = last_dir
       last_dir = FileUtils.pwd
       FileUtils.cd('..')
     end
@@ -28,6 +30,12 @@ class Leg::CLI
   def run(args)
     args = ["help"] if args.empty?
     cmd_name = args.shift.downcase
+
+    if cmd_name =~ /\A\d+\z/
+      args.unshift(cmd_name)
+      cmd_name = "ref"
+    end
+
     if cmd = Leg::Commands::LIST.find { |cmd| cmd.name == cmd_name }
       cmd.new(args, @config).run
     else

data/lib/leg/commands.rb

@@ -7,6 +7,7 @@ require 'leg/commands/base_command'
 require 'leg/commands/diff'
 require 'leg/commands/help'
 require 'leg/commands/pieces'
+require 'leg/commands/ref'
 require 'leg/commands/repo'
 require 'leg/commands/undiff'
 require 'leg/commands/unrepo'

data/lib/leg/commands/base_command.rb

@@ -13,27 +13,59 @@ class Leg::Commands::BaseCommand
   end
 
   ERROR_MSG = {
-    config: "You are not in a leg working directory.",
+    config: {
+      true: "You are not in a leg working directory.",
+      false: "You are already in a leg working directory."
+    },
+    steps_folder: {
+      true: "There is no steps folder.",
+      false: "There is already a steps folder."
+    },
+    steps: {
+      true: "There are no steps in the steps folder."
+    },
+    repo: {
+      true: "There is no repo folder.",
+      false: "There is already a repo folder."
+    },
+    diff: {
+      true: "There is no steps.diff file."
+    }
   }
 
-  def needs!(what)
-    valid = false
+  def needs!(*whats)
+    options = whats.pop if whats.last.is_a? Hash
+    options ||= {}
 
-    case what
-    when :config
-      valid = true if @config
-    else
-      raise NotImplementedError
-    end
+    yes = Array(whats).flatten.map { |w| [w, true] }
+    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 :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"))
+      else
+        raise NotImplementedError
+      end
 
-    if !valid
-      puts "Error: " + ERROR_MSG[what]
-      exit!
+      if valid != v
+        puts "Error: " + ERROR_MSG[what][v.to_s.to_sym]
+        exit!
+      end
     end
   end
 
   def steps
-    @steps ||= Dir[File.join(@config[:path], "*")].map do |f|
+    @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? }
@@ -61,7 +93,7 @@ class Leg::Commands::BaseCommand
   end
 
   def step_path(step)
-    File.join(@config[:path], step)
+    File.join(@config[:path], "steps", step)
   end
 
   def select_step(step, &block)

data/lib/leg/commands/diff.rb

@@ -8,25 +8,20 @@ class Leg::Commands::Diff < Leg::Commands::BaseCommand
   end
 
   def run
-    needs! :config
-
-    if !File.exist?(File.join(@config[:path], "repo"))
-      puts "Error: Not in repo mode!"
-      exit!
-    end
+    needs! :config, :repo
 
     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)/
+          if line =~ /^(From|Date|index)/
             # skip
-          elsif line =~ /^Subject: \[[^\]]*\] (.*)$/
+          elsif line =~ /^Subject: \[[^\]]*\](.*)$/
             f << "\n" unless step_num == 1
-            parts = $1.split('-')
-            if parts.length >= 2
-              f << "~~~ step: #{parts[1..-1].join('-')}\n"
+            step_name = $1.strip
+            if step_name =~ /^\w+(-\w+)*$/
+              f << "~~~ step: #{step_name}\n"
             else
               f << "~~~ step\n"
             end

data/lib/leg/commands/ref.rb

@@ -0,0 +1,37 @@
+class Leg::Commands::Ref < Leg::Commands::BaseCommand
+  def self.name
+    "ref"
+  end
+
+  def self.summary
+    "Convert a step number or name to a git commit reference"
+  end
+
+  def run
+    needs! :config, :repo
+
+    ref = @args.first
+    is_num = (ref =~ /\A\d+\z/)
+
+    FileUtils.cd(@config[:path]) do
+      repo = Rugged::Repository.new("repo")
+
+      walker = Rugged::Walker.new(repo)
+      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 (is_num && ref == step_num) || (!is_num && ref == step_name)
+          puts commit.oid
+          exit
+        end
+      end
+
+      puts "Error: reference not found"
+      exit!
+    end
+  end
+end
+

data/lib/leg/commands/repo.rb

@@ -4,19 +4,14 @@ class Leg::Commands::Repo < Leg::Commands::BaseCommand
   end
 
   def self.summary
-    "Convert step folders into a version controlled repository"
+    "Convert steps folder into a version controlled repository"
   end
 
   def run
-    needs! :config
+    needs! :config, :steps_folder, :steps, not: :repo
 
     FileUtils.cd(@config[:path])
 
-    if File.exist?("repo")
-      puts "Error: A repo already exists!"
-      exit!
-    end
-
     FileUtils.mkdir("repo")
     repo = Rugged::Repository.init_at("repo")
 
@@ -35,106 +30,14 @@ class Leg::Commands::Repo < Leg::Commands::BaseCommand
 
       options = {}
       options[:tree] = index.write_tree(repo)
-      options[:message] = step
+      options[:message] = step_name(step) || "-"
       options[:parents] = repo.empty? ? [] : [repo.head.target]
       options[:update_ref] = 'HEAD'
 
-      commit_oid = Rugged::Commit.create(repo, options)
-
-      tags = []
-      if idx = step.index('-')
-        tags << step[0...idx]
-        tags << step[(idx+1)..-1]
-      else
-        tags << step
-      end
-
-      tags.each do |tag|
-        repo.references.create("refs/tags/#{tag}", commit_oid)
-      end
+      Rugged::Commit.create(repo, options)
     end
 
     repo.checkout_head(strategy: :force)
-
-    File.write("repo/.git/hooks/post-commit", POST_COMMIT_HOOK)
-    File.write("repo/.git/hooks/prepare-commit-msg", PREPARE_COMMIT_MSG_HOOK)
-    File.write("repo/.git/hooks/post-rewrite", POST_REWRITE_HOOK)
-    FileUtils.chmod(0755, "repo/.git/hooks/post-commit")
-    FileUtils.chmod(0755, "repo/.git/hooks/prepare-commit-msg")
-    FileUtils.chmod(0755, "repo/.git/hooks/post-rewrite")
-
-    FileUtils.rm_r(steps)
   end
-
-  POST_COMMIT_HOOK = <<~'EOF'
-    #!/usr/bin/env ruby
-
-    exit if File.exist?(File.join(ENV['GIT_DIR'], '.git/rebase-merge'))
-
-    require 'rugged'
-
-    repo = Rugged::Repository.discover
-    commit = repo.head.target
-    parts = commit.message.lines.first.strip.split('-').reject(&:empty?)
-    tags = [parts.shift]
-    tags << parts.join('-') unless parts.empty?
-
-    tags.each do |tag|
-      unless repo.tags[tag]
-        repo.references.create("refs/tags/#{tag}", commit.oid)
-      end
-    end
-  EOF
-
-  PREPARE_COMMIT_MSG_HOOK = <<~'EOF'
-    #!/usr/bin/env ruby
-
-    exit if File.exist?(File.join(ENV['GIT_DIR'], '.git/rebase-merge'))
-
-    msg = File.read(ARGV[0])
-    exit if !msg.lines.first.strip.empty?
-
-    require 'rugged'
-
-    repo = Rugged::Repository.discover
-    last_commit = repo.head.target
-    step_num = nil
-    repo.tags.each do |tag|
-      if tag.name =~ /\A\d+(\.\d+)*\z/ && tag.target.oid == last_commit.oid
-        step_num = tag.name
-        break
-      end
-    end
-
-    if step_num
-      step_num = step_num.split('.')
-      step_num[-1] = (step_num[-1].to_i + 1).to_s
-      step_num = step_num.join('.')
-
-      msg = File.read(ARGV[0])
-      msg = "#{step_num}-#{msg}"
-      File.write(ARGV[0], msg)
-    end
-  EOF
-
-  POST_REWRITE_HOOK = <<~'EOF'
-    #!/usr/bin/env ruby
-
-    require 'rugged'
-
-    repo = Rugged::Repository.discover
-
-    tags = {}
-    repo.tags.each do |tag|
-      tags[tag.target.oid] = tag.name
-    end
-
-    while line = $stdin.gets
-      old_sha1, new_sha1 = line.split
-      if tags[old_sha1]
-        repo.references.update("refs/tags/#{tags[old_sha1]}", new_sha1)
-      end
-    end
-  EOF
 end
 

data/lib/leg/commands/undiff.rb

@@ -4,57 +4,45 @@ class Leg::Commands::Undiff < Leg::Commands::BaseCommand
   end
 
   def self.summary
-    "Conver steps.diff to step folders"
+    "Convert steps.diff to steps folder"
   end
 
   def run
-    needs! :config
+    needs! :config, :diff, not: :steps_folder
 
     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)
+      FileUtils.mkdir("steps")
+      FileUtils.cd("steps") do
+        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
-            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
+          apply_diff(step_dir, cur_diff) if cur_diff
         end
-        apply_diff(step_dir, cur_diff) if cur_diff
       end
     end
   end

data/lib/leg/commands/unrepo.rb

@@ -4,39 +4,34 @@ class Leg::Commands::Unrepo < Leg::Commands::BaseCommand
   end
 
   def self.summary
-    "Convert repository into step folders"
+    "Convert repository into steps folder"
   end
 
   def run
-    needs! :config
+    needs! :config, :repo, not: :steps_folder
 
-    FileUtils.cd(@config[:path])
+    FileUtils.cd(@config[:path]) do
+      FileUtils.mkdir("steps")
 
-    if !File.exist?("repo")
-      puts "Error: repo folder doesn't exist!"
-      exit!
-    end
+      repo = Rugged::Repository.new("repo")
 
-    repo = Rugged::Repository.new("repo")
+      walker = Rugged::Walker.new(repo)
+      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
 
-    walker = Rugged::Walker.new(repo)
-    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 = (idx + 1).to_s
-      step_name = step
+        if step_name.empty?
+          step = step_num
+        else
+          step = "#{step_num}-#{step_name}"
+        end
 
-      parts = commit.message.lines.first.strip.split('-')
-      if parts.length >= 2
-        step_name += "-#{parts[1..-1].join('-')}"
+        repo.checkout(commit.oid, strategy: :force,
+                                  target_directory: step_path(step))
       end
-
-      step_path = File.join(@config[:path], step_name)
-
-      repo.checkout(commit.oid, strategy: :force, target_directory: step_path)
     end
-
-    FileUtils.rm_r("repo")
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oleg
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -39,6 +39,7 @@ files:
 - lib/leg/commands/diff.rb
 - lib/leg/commands/help.rb
 - lib/leg/commands/pieces.rb
+- lib/leg/commands/ref.rb
 - lib/leg/commands/repo.rb
 - lib/leg/commands/undiff.rb
 - lib/leg/commands/unrepo.rb