Allow initialization of an existing directory

Author: suhlig

.rspec

@@ -0,0 +1,5 @@
+--color
+--format documentation
+--tty
+--order random
+--require 'spec_helper'

README.markdown

@@ -30,6 +30,7 @@ This gem provides a set of [`Rake`](https://github.com/ruby/rake) tasks to creat
 
 # TODO
 
+1. Allow initializing the current directory
 1. `revealing doctor` to analyze tools
 1. Target folders mirror source, so that we don't risk duplicates
 1. Read desired versions of dependencies from a YAML file (with sensible defaults coming from this project)

lib/revealing/cli.rb

@@ -1,14 +1,35 @@
 require 'thor'
+require 'pathname'
 
 module Revealing
   class CLI < Thor
     desc 'init DIRECTORY', "initialize a new revealing project in DIRECTORY."
     def init(directory)
       project_directory = Pathname(directory)
-      project_directory.mkdir
+      project_directory.mkdir unless project_directory.exist?
 
-      templates_directory = Pathname(__dir__) / '../../templates'
-      FileUtils.cp_r(templates_directory / 'init/.', project_directory)
+      templates_directory = Pathname(__dir__) / '../../templates/init'
+
+      # FileUtils.cp_r overwrites the target if it exists, but we want to preserve it
+      # and print information about what happened
+      source_target_pairs(templates_directory, project_directory).each do |src, target|
+        if target.exist?
+          warn "#{target} exists; skipping"
+        else
+          target.dirname.mkpath
+          FileUtils.cp(src, target)
+          puts "#{target} created"
+        end
+      end
+    end
+
+    private
+
+    def source_target_pairs(src_dir, target_dir)
+      src_dir
+        .glob('**/*')
+        .select(&:file?)
+        .map{|e| [e, target_dir / e.relative_path_from(src_dir)]}
     end
   end
 end

spec/system/init_spec.rb

@@ -4,25 +4,48 @@
 
 describe 'init', type: 'aruba' do
   let(:revealing_init) { "#{aruba.root_directory}/exe/revealing init" }
+  let(:cwd) { Pathname(aruba.config.working_directory) }
+  let(:project_directory) { cwd / 'shiny-new-presentation' }
+  let(:project_files) { %w[src/index.markdown Rakefile Gemfile README.markdown].map { |e| project_directory / e } }
 
-  context 'with a new project directory' do
-    let(:project_directory) { 'shiny-new-presentation' }
-    let(:cwd) { Pathname(aruba.config.working_directory) }
-
-    before do
-      run_command "#{revealing_init} #{project_directory}"
+  shared_examples 'a new project directory' do
+    it 'creates the required files in the new project directory' do
+      run_command "#{revealing_init} #{project_directory.basename}"
       expect(last_command_started).to be_successfully_executed
+      expect(project_files).to all(exist)
     end
+  end
 
+  context 'with a new project directory' do
     it 'creates the new project directory' do
-      expect(cwd / project_directory).to be_directory
+      run_command "#{revealing_init} #{project_directory.basename}"
+      expect(last_command_started).to be_successfully_executed
+      expect(project_directory).to be_directory
     end
 
-    it 'creates the required files in the new project directory' do
-      expect(cwd / project_directory / 'src/index.markdown').to exist
-      expect(cwd / project_directory / 'Rakefile').to exist
-      expect(cwd / project_directory / 'Gemfile').to exist
-      expect(cwd / project_directory / 'README.markdown').to exist
+    it_behaves_like('a new project directory')
+  end
+
+  context 'with an existing (empty) project directory' do
+    before do
+      project_directory.mkdir
+      expect(project_directory).to be_directory
+    end
+
+    it_behaves_like('a new project directory')
+
+    context 'the README already exists' do
+      let(:readme) { (project_directory / 'README.markdown') }
+
+      before do
+        readme.write('fooo')
+      end
+
+      it 'does not override an existing file' do
+        run_command "#{revealing_init} #{project_directory.basename}"
+        expect(last_command_started).to be_successfully_executed
+        expect(readme.read).to eq('fooo')
+      end
     end
   end
 end