polka 0.0.1 → 0.0.2

data/README.md

@@ -6,6 +6,8 @@ Polka sets up your dotfiles
 
 In your dotfile directory create a file called `Dotfile`. My Dotfile looks like this:
 
+    configure personal_file: "~/Dropbox/polka_personal.yml"
+
     symlink ".gemrc", ".vimrc", ".zshrc", ".zsh_custom", ".vim"
     symlink ".gitignore_global", as: ".gitignore"
     copy ".gitconfig.erb"
@@ -26,5 +28,4 @@ In `.gitconfig.erb`:
       name = <%= personal['name'] %>
       email = <%= personal['email'] %>
 
-`personal.yml` should be added to your `.gitignore`, ldo.
-
+`personal.yml` is expected to be in your dotfile directory and should be added to your `.gitignore`, ldo. Alternatively, you can configure an alternate path (see example).

data/lib/polka.rb

@@ -20,6 +20,12 @@ module Polka
   end
 
   def self.log(msg)
-    puts msg
+    $stdout.puts msg
+  end
+
+  def self.ask(question)
+    $stdout.print question
+    $stdout.flush
+    $stdin.gets.chomp
   end
 end

data/lib/polka/operations/parsed_copying.rb

@@ -30,12 +30,25 @@ module Polka
       end
 
       def context
-        YAML.load_file(yaml_file)[context_name]
+        context = Hash.new do |_, k|
+          Polka.log "    Warning: ".yellow + "personal['#{k}'] not found for #{context_name} in #{yaml_file}."
+          Polka.ask "    Please provide personal['#{k}'] for #{context_name}: "
+        end
+
+        if File.exists?(yaml_file)
+          yaml_hash = YAML.load_file(yaml_file)[context_name]
+          context = context.merge(yaml_hash) if yaml_hash
+        end
+
+        return context
       end
 
       def yaml_file
         filename = Polka.config[:personal_file] || File.join(File.dirname(@file), "personal.yml")
-        File.expand_path(filename)
+        filename = File.expand_path(filename)
+        Polka.log("Warning! ".yellow + "Could not find personal file at #{filename}") unless File.exists?(filename)
+
+        filename
       end
 
       def context_name

data/lib/polka/version.rb

@@ -1,3 +1,3 @@
 module Polka
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/polka/operations/parsed_copying_spec.rb

@@ -1,22 +1,38 @@
 require "spec_helper"
 
 describe Polka::Operations::ParsedCopying, :integrated_with_files do
+  subject(:copier) { Polka::Operations::ParsedCopying }
+  let(:input_file) { File.join(dotfile_dir, "to_be_parsed.erb") }
+  let(:output_file) { File.join(home_dir, "parsable") }
+  let(:personal_file) { File.join(dotfile_dir, "personal.yml") }
   set_up_testdirs
 
   before do
-    File.open(File.join(dotfile_dir, "blah.erb"), "w") { |f| f.write("hello <%= personal['name'] %>") }
+    File.open(input_file, "w") { |f| f.write("hello <%= personal['name'] %>") }
   end
 
   def write_personal_file(filename)
-    File.open(filename, "w") { |f| f.write("blah:\n  name: ray stanz") }
+    File.open(filename, "w") { |f| f.write("to_be_parsed:\n  name: ray stanz") }
+  end
+
+  def parsed_content
+    File.open(output_file) { |f| f.read }
   end
 
   it "parses the erb file and copys the result without the extension" do
-    personal_file = File.join(dotfile_dir, "personal.yml")
     write_personal_file(personal_file)
 
-    Polka::Operations::ParsedCopying.call(File.join(dotfile_dir, "blah.erb"), File.join(home_dir, "foo.erb"))
-    File.open(File.join(home_dir, "foo")) { |f| f.read }.should == "hello ray stanz"
+    copier.call(input_file, output_file + ".erb")
+    parsed_content.should == "hello ray stanz"
+  end
+
+  it "prompts for input if a personal reference is missing from personal.yml" do
+    write_personal_file(personal_file)
+
+    File.open(input_file, "w") { |f| f.write("hello <%= personal['not_name'] %>") }
+    Polka.stub(:ask) { "johnny" }
+    copier.call(input_file, output_file)
+    parsed_content.should == "hello johnny"
   end
 
   it "uses the personal.yml provided in the config" do
@@ -27,7 +43,14 @@ describe Polka::Operations::ParsedCopying, :integrated_with_files do
 
     Polka.stub(:config) { { personal_file: another_dir + "/polka_personal.yml" } }
 
-    Polka::Operations::ParsedCopying.call(File.join(dotfile_dir, "blah.erb"), File.join(home_dir, "foo.erb"))
-    File.open(File.join(home_dir, "foo")) { |f| f.read }.should == "hello ray stanz"
+    copier.call(input_file, output_file)
+    parsed_content.should == "hello ray stanz"
+  end
+
+  it "doesn't produce errors if personal file is missing" do
+    Polka.stub(:config) { { personal_file: "does_not_exist" } }
+    Polka.stub(:ask) { "what" }
+    Polka.stub(:log)
+    expect { copier.call(input_file, output_file) }.to_not raise_error
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polka
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70306305111260 !ruby/object:Gem::Requirement
+  requirement: &70261072235760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306305111260
+  version_requirements: *70261072235760
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70306305110480 !ruby/object:Gem::Requirement
+  requirement: &70261072235260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *70306305110480
+  version_requirements: *70261072235260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70306305109660 !ruby/object:Gem::Requirement
+  requirement: &70261072234800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70306305109660
+  version_requirements: *70261072234800
 description: Easy Dotfile Management
 email:
 - michi.huber@gmail.com