chrislloyd-pixii 0.1.4 → 0.1.6

data/README.md

@@ -64,14 +64,16 @@ I understand that three spells may not be enough for the more advanced wizards o
     class Pixii
       def git_clone(repo, dest)
         step "Cloning #{repo}..." do
-          `git clone #{repo} #{dest}`
+          `git clone #{repo} #{inside(:dest,dest)}`
         end
       end
     end
 
 Just place that at the top of your script. Pretty simple! The only new thing that you have to get is the `step` method. That basically just defines a step to run. The `"Cloning ..."` passed in at the start is just a string describing what you are doing. You don't have to pass anything there and `step do` is perfectly acceptable.
 
-You can now use this in your potion:
+The `inside(:dest, ...)` method basically scopes a path to the destination directory. `inside` can take `:dest`, `:templates` or `:src`.
+
+You can now use `git_clone` in your potion:
 
     make.git_clone 'git://github.com/chrislloyd/gravtastic.git', 'vendor/gems/gravtastic'
 

data/lib/pixii.rb

@@ -24,7 +24,7 @@ class Pixii
   attr_accessor :name, :steps
 
   def self.defaults
-    @@defaults ||= {:project => ARGV.first, :templates => '../templates'}
+    @@defaults ||= {:project => ARGV.first}
   end
 
   def self.defaults=(hsh); @@defaults = hsh; end
@@ -44,10 +44,10 @@ class Pixii
   end
 
   def normalize_opts!
-    # TODO: fix caller[1] hack
-    opts.src_dir = File.expand_path(File.dirname(caller[1].split(':').first))
-    opts.template_dir = File.join(opts.src_dir, opts.templates)
-    opts.dest_dir = File.expand_path(File.join(Dir.pwd, opts.project))
+    # TODO fix caller[1] hack
+    opts.src_dir ||= File.expand_path(File.dirname(caller[1].split(':').first))
+    opts.templates_dir = opts.templates || inside(:src, '..', 'templates')
+    opts.dest_dir ||= File.expand_path(File.join(Dir.pwd, opts.project))
   end
 
   def step(msg=nil, &blk)
@@ -57,48 +57,50 @@ class Pixii
   def dir(*dirs)
     dirs.each do |d|
       step do
-        FileUtils.mkdir_p(d)
+        FileUtils.mkdir_p inside(:dest, d)
       end
     end
   end
 
   def clone(src, dest)
     step do
-      src = File.join(opts.src_dir, src) if URI::parse(src).scheme.nil?
+      src = inside(:templates, src) if URI::parse(src).scheme.nil?
       open(src) do |sf|
-        File.open(dest,'wb') do |f|
+        File.open(inside(:dest, dest), 'wb') do |f|
           f.write(sf.read)
-        end
-      end
-    end
-  end
+        end # down
+      end   #   down
+    end     #     to
+  end       #       funkytown
 
   def template(src_tmpl, dest, env={})
     step do
-      src_tmpl = File.join(opts.template_dir, src_tmpl)
+      src_tmpl = inside(:templates, src_tmpl)
       tmpl = File.open(src_tmpl){|f| f.read }
 
       env = env.merge!(opts).to_mash
-      File.open(dest,'w') do |f|
+      File.open(inside(:dest, dest), 'w') do |f|
         f.write(ERB.new(tmpl).result(env.binding))
       end
     end
   end
 
   def magic!
-    make_and_change_to_dest! do
-      steps.each do |step|
-        puts step.first unless step.first.nil?
-        step.last.call
-      end
+    make_dest
+    steps.each do |step|
+      puts step.first unless step.first.nil?
+      step.last.call
     end
   end
 
   # private
 
-  def make_and_change_to_dest!(&blk)
+  def inside(dir, *file)
+    File.join(opts.send("#{dir}_dir"), *file)
+  end
+
+  def make_dest
     FileUtils.mkdir_p opts.dest_dir
-    Dir.chdir(opts.dest_dir, &blk)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chrislloyd-pixii
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - Chris Lloyd