leitmotif 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76dc265b295f6992a5ae6ad03e73c4353c575997
-  data.tar.gz: 8eca58e6c899b389ef969c2da5ff3d4f22cd4d33
+  metadata.gz: 2d9079e52a65fd270756e1023f9f7dfe037680ea
+  data.tar.gz: c9c2670e5ed42f92ae64d7cd09b5884f4015c34f
 SHA512:
-  metadata.gz: 612823d2c9c4ae9aa8b406eb3e80828a25c04e6f702f41fef3279937779d0fdf0a54bc5aefa89cd18d74a0b6a7a2949bbd5905477e1158109d1609f149d0b2d4
-  data.tar.gz: a6138434773482b06ff24ddb20258b9c8f70885fd9d8caff68d24b73e5094c8e9a4aa289f181df2d3a00c142ab0a7dc6ddc25a6b030a2d68a9275f70a78d4dd5
+  metadata.gz: aefafc04b2dc8794588184d1058aa927acf822f38e9d2574769c2cf77db585e7f22180d4ecf03ad703bbd2e29d1093847a51e3b01062c5a372e0a27e30bda202
+  data.tar.gz: 8147b1152d2ee7868e6fcdcba324fc1ba391a3234c037d94b6edb3ce1a2cba8f0ef67b69b6c96a0033e23aa354a8c6082ca327cc12a61a858201d2f05276ded3

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/leitmotif

@@ -4,6 +4,13 @@ require "rubygems"
 require "thor"
 require "leitmotif" # SKIP_FOR_STANDALONE
 
+module CLIHelpers
+  def symbolize_hash(hash)
+    hash.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
+  end
+end
+  
+
 class LeitmotifCLI < Thor
   desc "generate PROTOTYPE OUTPUT_DIR", "instantiate PROTOTYPE into OUTPUT_DIR"
   method_option :clobber, :type => :boolean, :desc => "overwrite OUTPUT_DIR if it exists"
@@ -18,7 +25,7 @@ class LeitmotifCLI < Thor
     puts "prototype is #{prototype}" if $LEITMOTIF_DEBUG
     puts "output_dir is #{output_dir}" if $LEITMOTIF_DEBUG
     puts "options are #{options.inspect}" if @LEITMOTIF_DEBUG
-    symbolized_options = options.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
+    symbolized_options = symbolize_hash(options)
     exit(Leitmotif.new(symbolized_options[:bindings], symbolized_options).run(prototype, output_dir))
   end
   
@@ -26,19 +33,28 @@ class LeitmotifCLI < Thor
   method_option :verbose, :type => :boolean, :desc => "provide additional debugging output"
   method_option :debug, :type => :boolean, :desc => "provide way too much additional debugging output"
   def clone(url)
-    symbolized_options = options.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
-    
-    exit(LocalPrototypeStore.new(symbolized_options).cloneProto(url))
+    exit(LocalPrototypeStore.new(symbolize_hash(options)).cloneProto(url))
   end
   
   desc "list", "show locally-installed prototypes"
   method_option :verbose, :type => :boolean, :desc => "provide additional debugging output"
   method_option :debug, :type => :boolean, :desc => "provide way too much additional debugging output"
   def list()
-    symbolized_options = options.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
-    
-    exit(LocalPrototypeStore.new(symbolized_options).list())
+    exit(LocalPrototypeStore.new(symbolize_hash(options)).list())
   end
+  
+  desc "new-prototype NAME", "create a new leitmotif prototype named NAME"
+  method_option :local, :type => :boolean, :desc => "create the new prototype in the local store"
+  method_option :clobber, :type => :boolean, :desc => "overwrite destination if it exists"
+  method_option :edit, :type => :boolean, :desc => "open the new prototype immediately with $EDITOR"
+  method_option :verbose, :type => :boolean, :desc => "provide additional debugging output"
+  method_option :debug, :type => :boolean, :desc => "provide way too much additional debugging output"
+  def new_prototype(name)
+    exit(PrototypeCreator.new(name, symbolize_hash(options)).create())
+  end
+
+  private
+  include CLIHelpers
 end
 
 LeitmotifCLI.start

data/extra/standalone/leitmotif

@@ -102,6 +102,97 @@ module LMPath
   def self.localPrototypeStore
     File.join(Dir.home, ".leitmotif-prototypes")
   end
+  
+  def check_output_dir(outputDir)
+    if File.exists?(outputDir)
+      if @options[:clobber]
+        FileUtils.rm_rf(outputDir)
+      else
+        raise "#{outputDir} already exists; move it first"
+      end
+    end
+  end
+  
+  def ensure_exists(path)
+    unless File.exists?(path)
+      FileUtils.mkdir_p(path)
+    end
+    path
+  end
+end
+
+class PrototypeCreator
+  DEFAULT_OPTIONS = {:git => "/usr/bin/git", 
+      :verbose => false, 
+      :debug => false, 
+      :clobber => false,
+      :local => false,
+      :edit => false,
+      :author => nil,
+      :email => nil,
+      :commit_message => "Initial revision"}
+  
+  include LMProcessHelpers
+  include LMPath
+  
+  def initialize(name, options = nil)
+    @options = DEFAULT_OPTIONS.merge(options || {})
+    @options[:author] ||= spawn_and_capture(%W{#{@options[:git]} config --global user.name}).strip
+    @options[:email] ||= spawn_and_capture(%W{#{@options[:git]} config --global user.email}).strip
+    @name = name
+    
+    ensure_exists(LMPath::localPrototypeStore) if @options[:local]
+  end
+  
+  def create()
+    outputDir = @options[:local] ? File.join(LMPath::localPrototypeStore, @name) : @name
+    check_output_dir(outputDir)
+    ensure_exists(outputDir)
+    
+    oldcwd = Dir.getwd()
+    Dir.chdir(outputDir)
+    
+    begin
+      spawn_and_capture(%W{#{@options[:git]} init})
+      o,e = spawn_with_input(make_history_file, %W{#{@options[:git]} fast-import})
+      puts o if @options[:debug]
+      puts e if @options[:debug]
+      spawn_and_capture(%W{#{@options[:git]} checkout -b master refs/head/master})
+      
+      exec([ENV["EDITOR"],ENV["EDITOR"]], File.realpath(outputDir)) if @options[:edit]
+    ensure
+      Dir.chdir(oldcwd)
+    end
+    
+    0
+  end
+  
+  private
+  
+  def make_history_file()
+    metadata = "---\n:name: #{@name}\n:version: '0'\n:required: []\n:ignore: []\n:defaults: {}\n"
+    readme = "This is an empty Leitmotif prototype.  For details on how to set it up,\nplease see https://github.com/willb/leitmotif/wiki\n"
+    ts = Time.now.strftime('%s %z')
+    <<-eos
+blob
+mark :1
+data #{metadata.length}
+blob
+mark :2
+data #{readme.length}
+reset refs/head/master
+commit refs/head/master
+mark :3
+author #{@options[:author]} <#{@options[:email]}> #{ts}
+committer #{@options[:author]} <#{@options[:email]}> #{ts}
+data #{@options[:commit_message].length}
+M 100644 :1 .leitmotif
+M 100644 :2 proto/README
+done
+
+eos
+  end
+    
 end
 
 class LocalPrototypeStore
@@ -112,17 +203,16 @@ class LocalPrototypeStore
   def initialize(options = nil)
     @options = DEFAULT_OPTIONS.merge(options || {})
     @localps = LMPath::localPrototypeStore
-    unless File.exists?(@localps)
-      FileUtils.mkdir_p(@localps)
-    end
+    ensure_exists(@localps)
   end
   
   include LMProcessHelpers
+  include LMPath
   
   def cloneProto(remoteURL)
     begin
       prototypeName = prototype_name(remoteURL)
-      spawn_and_capture(%Q{#{@options[:git]} clone #{remoteURL} "#{File.join(LMPath::localPrototypeStore, prototypeName)}"})
+      spawn_and_capture(%W{#{@options[:git]} clone #{remoteURL} "#{File.join(LMPath::localPrototypeStore, prototypeName)}"})
       0
     rescue Exception=>ex
       puts "error:  #{ex}"
@@ -215,16 +305,6 @@ class Leitmotif
     0
   end
   
-  def check_output_dir(outputDir)
-    if File.exists?(outputDir)
-      if @options[:clobber]
-        FileUtils.rm_rf(outputDir)
-      else
-        raise "#{outputDir} already exists; move it first"
-      end
-    end
-  end
-  
   def get_meta_and_proto(remote, treeish = nil)
     meta = nil
     proto = nil
@@ -242,22 +322,22 @@ class Leitmotif
   
   def get_meta(remote, treeish = nil)
     treeish ||= @options[:default_treeish]
-    metaArchive = spawn_and_capture(%Q{#{@options[:git]} archive --remote #{remote} #{treeish} .leitmotif})
-    meta, = spawn_with_input(metaArchive, %Q{#{@options[:tar]} xO .leitmotif})
+    metaArchive = spawn_and_capture(%W{#{@options[:git]} archive --remote #{remote} #{treeish} .leitmotif})
+    meta, = spawn_with_input(metaArchive, %W{#{@options[:tar]} xO .leitmotif})
     meta
   end
   
   def get_proto(remote, treeish = nil)
     treeish ||= @options[:default_treeish]
-    spawn_and_capture(%Q{#{@options[:git]} archive --remote #{remote} #{treeish} proto})
+    spawn_and_capture(%W{#{@options[:git]} archive --remote #{remote} #{treeish} proto})
   end
   
   def unpack_proto!(archive)
-    spawn_with_input(archive, %Q{#{@options[:tar]} x --strip 1})
+    spawn_with_input(archive, %W{#{@options[:tar]} x --strip 1})
   end
   
   def list_proto(archive)
-    out, err = spawn_with_input(archive, %Q{#{@options[:tar]} t})
+    out, err = spawn_with_input(archive, %W{#{@options[:tar]} t})
     out.split("\n")
   end
 
@@ -267,6 +347,13 @@ end
 require "rubygems"
 require "thor"
 
+module CLIHelpers
+  def symbolize_hash(hash)
+    hash.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
+  end
+end
+  
+
 class LeitmotifCLI < Thor
   desc "generate PROTOTYPE OUTPUT_DIR", "instantiate PROTOTYPE into OUTPUT_DIR"
   method_option :clobber, :type => :boolean, :desc => "overwrite OUTPUT_DIR if it exists"
@@ -281,7 +368,7 @@ class LeitmotifCLI < Thor
     puts "prototype is #{prototype}" if $LEITMOTIF_DEBUG
     puts "output_dir is #{output_dir}" if $LEITMOTIF_DEBUG
     puts "options are #{options.inspect}" if @LEITMOTIF_DEBUG
-    symbolized_options = options.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
+    symbolized_options = symbolize_hash(options)
     exit(Leitmotif.new(symbolized_options[:bindings], symbolized_options).run(prototype, output_dir))
   end
   
@@ -289,19 +376,28 @@ class LeitmotifCLI < Thor
   method_option :verbose, :type => :boolean, :desc => "provide additional debugging output"
   method_option :debug, :type => :boolean, :desc => "provide way too much additional debugging output"
   def clone(url)
-    symbolized_options = options.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
-    
-    exit(LocalPrototypeStore.new(symbolized_options).cloneProto(url))
+    exit(LocalPrototypeStore.new(symbolize_hash(options)).cloneProto(url))
   end
   
   desc "list", "show locally-installed prototypes"
   method_option :verbose, :type => :boolean, :desc => "provide additional debugging output"
   method_option :debug, :type => :boolean, :desc => "provide way too much additional debugging output"
   def list()
-    symbolized_options = options.inject({}){|acc,(k,v)| acc[k.to_sym] = v; acc}
-    
-    exit(LocalPrototypeStore.new(symbolized_options).list())
+    exit(LocalPrototypeStore.new(symbolize_hash(options)).list())
+  end
+  
+  desc "new-prototype NAME", "create a new leitmotif prototype named NAME"
+  method_option :local, :type => :boolean, :desc => "create the new prototype in the local store"
+  method_option :clobber, :type => :boolean, :desc => "overwrite destination if it exists"
+  method_option :edit, :type => :boolean, :desc => "open the new prototype immediately with $EDITOR"
+  method_option :verbose, :type => :boolean, :desc => "provide additional debugging output"
+  method_option :debug, :type => :boolean, :desc => "provide way too much additional debugging output"
+  def new_prototype(name)
+    exit(PrototypeCreator.new(name, symbolize_hash(options)).create())
   end
+
+  private
+  include CLIHelpers
 end
 
 LeitmotifCLI.start

data/leitmotif.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: leitmotif 0.0.1 ruby lib
+# stub: leitmotif 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "leitmotif"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["William Benton"]
-  s.date = "2014-10-08"
+  s.date = "2014-10-09"
   s.description = "there are many like it, but this one is mine"
   s.email = "self@willbenton.com"
   s.executables = ["leitmotif"]

data/lib/leitmotif.rb

@@ -42,6 +42,100 @@ module LMPath
   def self.localPrototypeStore
     File.join(Dir.home, ".leitmotif-prototypes")
   end
+  
+  def check_output_dir(outputDir)
+    if File.exists?(outputDir)
+      if @options[:clobber]
+        FileUtils.rm_rf(outputDir)
+      else
+        raise "#{outputDir} already exists; move it first"
+      end
+    end
+  end
+  
+  def ensure_exists(path)
+    unless File.exists?(path)
+      FileUtils.mkdir_p(path)
+    end
+    path
+  end
+end
+
+class PrototypeCreator
+  DEFAULT_OPTIONS = {:git => "/usr/bin/git", 
+      :verbose => false, 
+      :debug => false, 
+      :clobber => false,
+      :local => false,
+      :edit => false,
+      :author => nil,
+      :email => nil,
+      :commit_message => "Initial revision"}
+  
+  include LMProcessHelpers
+  include LMPath
+  
+  def initialize(name, options = nil)
+    @options = DEFAULT_OPTIONS.merge(options || {})
+    @options[:author] ||= spawn_and_capture(%W{#{@options[:git]} config --global user.name}).strip
+    @options[:email] ||= spawn_and_capture(%W{#{@options[:git]} config --global user.email}).strip
+    @name = name
+    
+    ensure_exists(LMPath::localPrototypeStore) if @options[:local]
+  end
+  
+  def create()
+    outputDir = @options[:local] ? File.join(LMPath::localPrototypeStore, @name) : @name
+    check_output_dir(outputDir)
+    ensure_exists(outputDir)
+    
+    oldcwd = Dir.getwd()
+    Dir.chdir(outputDir)
+    
+    begin
+      spawn_and_capture(%W{#{@options[:git]} init})
+      o,e = spawn_with_input(make_history_file, %W{#{@options[:git]} fast-import})
+      puts o if @options[:debug]
+      puts e if @options[:debug]
+      spawn_and_capture(%W{#{@options[:git]} checkout -b master refs/head/master})
+      
+      exec([ENV["EDITOR"],ENV["EDITOR"]], File.realpath(outputDir)) if @options[:edit]
+    ensure
+      Dir.chdir(oldcwd)
+    end
+    
+    0
+  end
+  
+  private
+  
+  def make_history_file()
+    metadata = "---\n:name: #{@name}\n:version: '0'\n:required: []\n:ignore: []\n:defaults: {}\n"
+    readme = "This is an empty Leitmotif prototype.  For details on how to set it up,\nplease see https://github.com/willb/leitmotif/wiki\n"
+    ts = Time.now.strftime('%s %z')
+    <<-eos
+blob
+mark :1
+data #{metadata.length}
+#{metadata}
+blob
+mark :2
+data #{readme.length}
+#{readme}
+reset refs/head/master
+commit refs/head/master
+mark :3
+author #{@options[:author]} <#{@options[:email]}> #{ts}
+committer #{@options[:author]} <#{@options[:email]}> #{ts}
+data #{@options[:commit_message].length}
+#{@options[:commit_message]}
+M 100644 :1 .leitmotif
+M 100644 :2 proto/README
+done
+
+eos
+  end
+    
 end
 
 class LocalPrototypeStore
@@ -52,17 +146,16 @@ class LocalPrototypeStore
   def initialize(options = nil)
     @options = DEFAULT_OPTIONS.merge(options || {})
     @localps = LMPath::localPrototypeStore
-    unless File.exists?(@localps)
-      FileUtils.mkdir_p(@localps)
-    end
+    ensure_exists(@localps)
   end
   
   include LMProcessHelpers
+  include LMPath
   
   def cloneProto(remoteURL)
     begin
       prototypeName = prototype_name(remoteURL)
-      spawn_and_capture(%Q{#{@options[:git]} clone #{remoteURL} "#{File.join(LMPath::localPrototypeStore, prototypeName)}"})
+      spawn_and_capture(%W{#{@options[:git]} clone #{remoteURL} "#{File.join(LMPath::localPrototypeStore, prototypeName)}"})
       0
     rescue Exception=>ex
       puts "error:  #{ex}"
@@ -155,16 +248,6 @@ class Leitmotif
     0
   end
   
-  def check_output_dir(outputDir)
-    if File.exists?(outputDir)
-      if @options[:clobber]
-        FileUtils.rm_rf(outputDir)
-      else
-        raise "#{outputDir} already exists; move it first"
-      end
-    end
-  end
-  
   def get_meta_and_proto(remote, treeish = nil)
     meta = nil
     proto = nil
@@ -182,22 +265,22 @@ class Leitmotif
   
   def get_meta(remote, treeish = nil)
     treeish ||= @options[:default_treeish]
-    metaArchive = spawn_and_capture(%Q{#{@options[:git]} archive --remote #{remote} #{treeish} .leitmotif})
-    meta, = spawn_with_input(metaArchive, %Q{#{@options[:tar]} xO .leitmotif})
+    metaArchive = spawn_and_capture(%W{#{@options[:git]} archive --remote #{remote} #{treeish} .leitmotif})
+    meta, = spawn_with_input(metaArchive, %W{#{@options[:tar]} xO .leitmotif})
     meta
   end
   
   def get_proto(remote, treeish = nil)
     treeish ||= @options[:default_treeish]
-    spawn_and_capture(%Q{#{@options[:git]} archive --remote #{remote} #{treeish} proto})
+    spawn_and_capture(%W{#{@options[:git]} archive --remote #{remote} #{treeish} proto})
   end
   
   def unpack_proto!(archive)
-    spawn_with_input(archive, %Q{#{@options[:tar]} x --strip 1})
+    spawn_with_input(archive, %W{#{@options[:tar]} x --strip 1})
   end
   
   def list_proto(archive)
-    out, err = spawn_with_input(archive, %Q{#{@options[:tar]} t})
+    out, err = spawn_with_input(archive, %W{#{@options[:tar]} t})
     out.split("\n")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leitmotif
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - William Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda