oleg 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f5e28e44643080bb4f06b3396701c0bdce1693
-  data.tar.gz: 0c1ab8f6502b31450ea97af8498d4a08bf54ec56
+  metadata.gz: 5ac8cee4dad8a55e94651eb2d33edd53cea75916
+  data.tar.gz: 84e8815155601c9aae38aef137118b32566b1eed
 SHA512:
-  metadata.gz: d4a7c99b7d778a0fce3d5af4bd14a8e7a9cdf1af4ba3414f13d11382928673c1eda2587dab92988292aed8de347e4ed0117ae9672f6377ef6ec5a698247c7ed8
-  data.tar.gz: ae2f6ce2b82963ce815cf68461cf9edb12ba24044a4d827d8c8273609fbcbef5ca48084b3e04fe2b7c831c23d804a124c57e1724451f43ce8d259b1474eb6064
+  metadata.gz: 2cdf3ddf88c6ba1d8a45cd97eaadf9ec5e915e615789ffbbcd578f2f0fe8435ad27a29a4a8957ef902128968e6efeec5e2322f57eea92ab9b7e0759af1227b04
+  data.tar.gz: 94b7d9b06b895d56075c3fb31249b713ca6445961f95f78b3818af9ca624632a79ecdf5eda99185f951f79c3731e08cdfd847e0200c578ddce7e6daee3941c71

data/lib/leg/commands/base_command.rb

@@ -14,10 +14,6 @@ class Leg::Commands::BaseCommand
 
   ERROR_MSG = {
     config: "You are not in a leg working directory.",
-    config_build: "Config file doesn't have build instructions.",
-    config_run: "Config file doesn't have run instructions.",
-    config_clean: "Config file doesn't have cleaning instructions.",
-    config_editor: "Config file doesn't specify a text editor."
   }
 
   def needs!(what)
@@ -26,14 +22,6 @@ class Leg::Commands::BaseCommand
     case what
     when :config
       valid = true if @config
-    when :config_build
-      valid = true if @config[:build]
-    when :config_run
-      valid = true if @config[:run]
-    when :config_clean
-      valid = true if @config[:clean]
-    when :config_editor
-      valid = true if @config[:editor]
     else
       raise NotImplementedError
     end
@@ -44,20 +32,10 @@ class Leg::Commands::BaseCommand
     end
   end
 
-  def shell_command(*cmd, exec: false, echo: true, exit_on_failure: true)
-    if exec
-      exec(*cmd)
-    else
-      puts cmd if echo
-      success = system(*cmd)
-      exit! if !success && exit_on_failure
-    end
-  end
-
   def steps
     @steps ||= Dir[File.join(@config[:path], "*")].map do |f|
       name = File.basename(f)
-      name if File.directory?(f) && name =~ /\A\d+(\.\d+)*\z/
+      name if File.directory?(f) && name =~ /\A\d+(\.\d+)*(-\w+)*\z/
     end.compact.sort_by { |s| s.split(".").map(&:to_i) }
   end
 

data/lib/leg/commands/repo.rb

@@ -0,0 +1,62 @@
+class Leg::Commands::Repo < Leg::Commands::BaseCommand
+  def self.name
+    "repo"
+  end
+
+  def self.summary
+    "Convert step folders into a version controlled repository"
+  end
+
+  def run
+    needs! :config
+
+    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")
+
+    steps.each do |step|
+      index = repo.index
+      index.read_tree(repo.head.target.tree) unless repo.empty?
+
+      FileUtils.cd(step_path(step)) do
+        Dir["**/*"].each do |path|
+          unless File.directory?(path)
+            oid = repo.write(File.read(path), :blob)
+            index.add(path: path, oid: oid, mode: 0100644)
+          end
+        end
+      end
+
+      options = {}
+      options[:tree] = index.write_tree(repo)
+      options[:message] = 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
+    end
+
+    repo.checkout_head(strategy: :force)
+
+    FileUtils.rm_r(steps)
+  end
+end
+

data/lib/leg/commands/unrepo.rb

@@ -0,0 +1,47 @@
+class Leg::Commands::Unrepo < Leg::Commands::BaseCommand
+  def self.name
+    "unrepo"
+  end
+
+  def self.summary
+    "Convert repository into step folders"
+  end
+
+  def run
+    needs! :config
+
+    FileUtils.cd(@config[:path])
+
+    if !File.exist?("repo")
+      puts "Error: repo folder doesn't exist!"
+      exit!
+    end
+
+    repo = Rugged::Repository.new("repo")
+
+    tag_names = {}
+    repo.tags.each do |tag|
+      if tag.name !~ /\A\d+(\.\d+)*\z/
+        tag_names[tag.target.oid] = tag.name
+      end
+    end
+
+    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 tag_name = tag_names[commit.oid]
+        step_name += "-#{tag_name}"
+      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
+

data/lib/leg/commands.rb

@@ -4,15 +4,8 @@ end
 
 require 'leg/commands/base_command'
 
-require 'leg/commands/build'
-require 'leg/commands/clean'
-require 'leg/commands/contract'
-require 'leg/commands/diff'
-require 'leg/commands/edit'
-require 'leg/commands/expand'
 require 'leg/commands/help'
-require 'leg/commands/ls'
-require 'leg/commands/next'
 require 'leg/commands/pieces'
-require 'leg/commands/run'
+require 'leg/commands/repo'
+require 'leg/commands/unrepo'
 

data/lib/leg.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'yaml'
+require 'rugged'
 
 module Leg
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oleg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
-dependencies: []
+date: 2017-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.25.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.25.1.1
 description: 
 email: jeremy.ruten@gmail.com
 executables:
@@ -22,17 +36,10 @@ files:
 - lib/leg/cli.rb
 - lib/leg/commands.rb
 - lib/leg/commands/base_command.rb
-- lib/leg/commands/build.rb
-- lib/leg/commands/clean.rb
-- lib/leg/commands/contract.rb
-- lib/leg/commands/diff.rb
-- lib/leg/commands/edit.rb
-- lib/leg/commands/expand.rb
 - lib/leg/commands/help.rb
-- lib/leg/commands/ls.rb
-- lib/leg/commands/next.rb
 - lib/leg/commands/pieces.rb
-- lib/leg/commands/run.rb
+- lib/leg/commands/repo.rb
+- lib/leg/commands/unrepo.rb
 homepage: https://github.com/yjerem/leg
 licenses:
 - MIT

data/lib/leg/commands/build.rb

@@ -1,19 +0,0 @@
-class Leg::Commands::Build < Leg::Commands::BaseCommand
-  def self.name
-    "build"
-  end
-
-  def self.summary
-    "Build a version (latest by default) of a project"
-  end
-
-  def run
-    needs! :config
-    needs! :config_build
-
-    select_step(current_or_latest_step) do
-      shell_command(@config[:build])
-    end
-  end
-end
-

data/lib/leg/commands/clean.rb

@@ -1,19 +0,0 @@
-class Leg::Commands::Clean < Leg::Commands::BaseCommand
-  def self.name
-    "clean"
-  end
-
-  def self.summary
-    "Delete files generated by the build command"
-  end
-
-  def run
-    needs! :config
-    needs! :config_clean
-
-    select_step(current_or_latest_step) do
-      shell_command(@config[:clean])
-    end
-  end
-end
-

data/lib/leg/commands/contract.rb

@@ -1,14 +0,0 @@
-class Leg::Commands::Contract < Leg::Commands::BaseCommand
-  def self.name
-    "contract"
-  end
-
-  def self.summary
-    "Package an expanded leg directory into a single .leg file"
-  end
-
-  def run
-    puts "Not implemented"
-  end
-end
-

data/lib/leg/commands/diff.rb

@@ -1,22 +0,0 @@
-class Leg::Commands::Diff < Leg::Commands::BaseCommand
-  def self.name
-    "diff"
-  end
-
-  def self.summary
-    "Display a diff between two versions of a file"
-  end
-
-  def run
-    needs! :config
-
-    step = @args.first || latest_step
-    step_idx = steps.index(step)
-    prev_step = steps[step_idx - 1]
-
-    FileUtils.cd(@config[:path]) do
-      shell_command("git diff --no-index #{prev_step} #{step}", exec: true)
-    end
-  end
-end
-

data/lib/leg/commands/edit.rb

@@ -1,34 +0,0 @@
-class Leg::Commands::Edit < Leg::Commands::BaseCommand
-  def self.name
-    "edit"
-  end
-
-  def self.summary
-    "Open a file in a text editor"
-  end
-
-  def run
-    needs! :config
-    needs! :config_editor
-
-    step = current_or_latest_step
-
-    files = Dir[File.join(step_path(step), "**/*")].reject { |f| File.directory? f }
-    if files.length == 0
-      puts "Error: No files to edit."
-      exit!
-    elsif files.length == 1
-      file_path = files[0]
-    elsif @config[:default_file]
-      file_path = @config[:default_file]
-    else
-      puts "Error: You'll need to choose a file to edit."
-      exit!
-    end
-
-    select_step(step) do
-      shell_command("#{@config[:editor]}", file_path, exec: true)
-    end
-  end
-end
-

data/lib/leg/commands/expand.rb

@@ -1,14 +0,0 @@
-class Leg::Commands::Expand < Leg::Commands::BaseCommand
-  def self.name
-    "expand"
-  end
-
-  def self.summary
-    "Expand a .leg file into a working directory"
-  end
-
-  def run
-    puts "Not implemented"
-  end
-end
-

data/lib/leg/commands/ls.rb

@@ -1,16 +0,0 @@
-class Leg::Commands::Ls < Leg::Commands::BaseCommand
-  def self.name
-    "ls"
-  end
-
-  def self.summary
-    "List step directories in order"
-  end
-
-  def run
-    needs! :config
-
-    steps.each { |s| puts s }
-  end
-end
-

data/lib/leg/commands/next.rb

@@ -1,21 +0,0 @@
-class Leg::Commands::Next < Leg::Commands::BaseCommand
-  def self.name
-    "next"
-  end
-
-  def self.summary
-    "Create a new step that is a copy of the latest step"
-  end
-
-  def run
-    needs! :config
-
-    latest_step = steps.last
-    next_step = (latest_step.to_i + 1).to_s
-
-    FileUtils.cd(@config[:path]) do
-      shell_command("cp -r #{latest_step} #{next_step}")
-    end
-  end
-end
-

data/lib/leg/commands/run.rb

@@ -1,19 +0,0 @@
-class Leg::Commands::Run < Leg::Commands::BaseCommand
-  def self.name
-    "run"
-  end
-
-  def self.summary
-    "Build and run a version (latest by default) of the project"
-  end
-
-  def run
-    needs! :config
-    needs! :config_run
-
-    select_step(current_or_latest_step) do
-      shell_command(@config[:run], exec: true)
-    end
-  end
-end
-