materielize 1.0.0 → 1.0.1

data/lib/materielize/version.rb

@@ -1,3 +1,3 @@
 module Materielize
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/materielize.rb

@@ -45,13 +45,17 @@ module Materielize
       FileUtils.rm_rf(root_path)
     end
 
-    def init_cfg_files
-      @overwrite_all = false # initialize this do as to not inadvertently cause disaster on a second call or somesuch.
+    def init_cfg_files(options = {})
+      @overwrite_all = {force_all: false}.merge(options)[:force_all] # initialize if not indicated so as to not inadvertently cause disaster on a second call or somesuch.
       @project_root = Dir.getwd
       @root = File.expand_path(default_config_dir, root_dir)
 
-      copy([root_dir, default_config_dir]) do |item|
-        yield(item)
+      begin
+        copy([root_dir, default_config_dir]) do |item|
+          yield(item)
+        end
+      rescue Interrupt => e
+        puts e
       end
     end
 
@@ -132,8 +136,9 @@ module Materielize
 
               # Check for a user cancellation before anything is done.
               if %w[c C].include?(options[:confirmation])
-                report_back(block, message: "Operation cancelled.")
-                return
+                message = "User cancelled operation."
+                report_back(block, message: message)
+                raise Interrupt.new(message)
               end
             end
 

data/lib/tasks/materiel.rake

@@ -27,9 +27,11 @@ namespace :materiel do
 
   desc "Copy default config files into place."
   task :init_config_files do
+    force = parse_args(ARGV)
+
     setup = Materielize::ConfigSetup.new
 
-    setup.init_cfg_files do |item|
+    setup.init_cfg_files(force_all: force) do |item|
       if item[:needs_confirmation]
         item[:confirmation] = ask(item[:message])
         puts
@@ -40,4 +42,22 @@ namespace :materiel do
 
     puts "Done."
   end
+
+  def parse_args(args)
+    if args.count > 2
+      puts "'force' is the only option"
+      puts "EX: rake materiel:init_config_files force"
+      raise ArgumentError
+    end
+
+    # No args given
+    return false if args.count == 1
+
+    # Swallow the arg so that it's not considered a real rake task by rake
+    option = args[1]
+    task option.to_sym do ; end
+
+    # Return true if force given as an arg.
+    return args[1].downcase == "force"
+  end
 end

data/spec/models/config_files_spec.rb

@@ -198,17 +198,17 @@ describe Materielize::ConfigSetup do
         file1_path = "materiel/default_config_files/#{sub1}/config_file.txt"
 
         # Place spoof file in its 'production' location to be found by process
-        FileUtils.cp(existing_file_name, "./root.txt")
-        @files_to_nuke << "root.txt"
+        FileUtils.cp(existing_file_name, "./config_file.txt")
+        @files_to_nuke << "config_file.txt"
 
 
         # Creating file path of default_cfg_file here for organization
         Dir.mkdir("config")
         @paths_to_nuke << "config"
-        file2_path = "materiel/default_config_files/root.txt"
+        file2_path = "materiel/default_config_files/config_file.txt"
 
         # Place spoof file in its 'production' location to be found by process
-        FileUtils.cp(existing_file_name, "config/root.txt")
+        FileUtils.cp(existing_file_name, "config/config_file.txt")
 
         create_subdirectory(sub1)
 
@@ -217,17 +217,20 @@ describe Materielize::ConfigSetup do
         FileUtils.cp(src_file_name, file1_path)
         FileUtils.cp(src_file_name, file2_path)
 
+        prompts = 0
         @setup.init_cfg_files do |item|
           if item[:needs_confirmation] == true
             # Deny the process's request to write over the file.
             item[:confirmation] = "n"
+            prompts += 1
           end
         end
+        prompts.should eq 2
 
-        FileUtils.identical?(existing_file_name, "root.txt").should be true
-        FileUtils.identical?(existing_file_name, "config/root.txt").should be true
-        FileUtils.identical?(src_file_name, "root.txt").should be false
-        FileUtils.identical?(src_file_name, "config/root.txt").should be false
+        FileUtils.identical?(existing_file_name, "config_file.txt").should be true
+        FileUtils.identical?(existing_file_name, "config/config_file.txt").should be true
+        FileUtils.identical?(src_file_name, "config_file.txt").should be false
+        FileUtils.identical?(src_file_name, "config/config_file.txt").should be false
       end
 
       it "overwrites existing files if the user indicates yes" do
@@ -356,10 +359,10 @@ describe Materielize::ConfigSetup do
 
         i = 0
         @setup.init_cfg_files do |item|
-          i += 1
           if item[:needs_confirmation] == true
             # Cancel the whole deal.
             item[:confirmation] = "c"
+            i += 1
           end
         end
         i.should eq 1 # There should have been one prompt

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: materielize
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec