rigit 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd2a2c78d7c9698965042e42736818edfbf35b015ee4e5f76fbf410dd0c6d4e4
-  data.tar.gz: c88d8463c4992fc279cf579a0cc1422f71ebd875e58631e25d940991d88a0708
+  metadata.gz: ae750bc5a6bcd7579e93397d0f493ba6c97f6fe7113f3300e4140889bdcf50ea
+  data.tar.gz: 38d60e9d8e133bc5eaeaa88c1f3d66df767f1ce810cb1e840dd209a148846d13
 SHA512:
-  metadata.gz: 766579f3d737a555cc26a8e4f47f9480f969d0938f15d8f94d6582f1b66d8cbc3fe2dd82a1dafa193c19ebdd1591a45a18768db9ba8bb0fc96bed170b184917b
-  data.tar.gz: fd7b722589b4b7f46cb25d414b75f939ed316288cb3a37f258391e5a692893694f087d95af782152241770afe53fa0a9e18d034437a30299b232a88b3f05546f
+  metadata.gz: 989498761d02c5066f1b897110bf30956991fbe5c3405add7af598bf325e12c885de0b63f80094c53c3ad689c588449bc03f8024c0e6cc1ca5e9ff7adfcf8786
+  data.tar.gz: 6c86d9888bbe5c16da0c167bfc46b228dd1f28bb070a16b2e688f1cd56c56ee62b19d05b728279e1b43389782a78192850fe2f48bde9ca09168ca324706df5aa

data/README.md

@@ -1,10 +1,10 @@
 Rigit
 ==================================================
 
-[![Gem](https://img.shields.io/gem/v/rigit.svg?style=flat-square)](https://rubygems.org/gems/rigit)
-[![Build](https://img.shields.io/travis/DannyBen/rigit.svg?style=flat-square)](https://travis-ci.org/DannyBen/rigit)
-[![Maintainability](https://img.shields.io/codeclimate/maintainability/DannyBen/rigit.svg?style=flat-square)](https://codeclimate.com/github/DannyBen/rigit)
-[![Issues](https://img.shields.io/codeclimate/issues/github/DannyBen/rigit.svg?style=flat-square)](https://codeclimate.com/github/DannyBen/rigit)
+[![Gem Version](https://badge.fury.io/rb/rigit.svg)](https://badge.fury.io/rb/rigit)
+[![Build Status](https://travis-ci.com/DannyBen/rigit.svg?branch=master)](https://travis-ci.com/DannyBen/rigit)
+[![Maintainability](https://api.codeclimate.com/v1/badges/d13abbe6f7601be78cf5/maintainability)](https://codeclimate.com/github/DannyBen/rigit/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/d13abbe6f7601be78cf5/test_coverage)](https://codeclimate.com/github/DannyBen/rigit/test_coverage)
 
 ---
 
@@ -375,3 +375,4 @@ params:
 [colsole-colors]: https://github.com/dannyben/colsole#color-codes
 [colsole]: https://github.com/dannyben/colsole
 
+

data/lib/rigit.rb

@@ -7,6 +7,8 @@ require 'rigit/rig'
 require 'rigit/git'
 require 'rigit/command_line'
 
+require 'byebug' if ENV['BYEBUG']
+
 module Rigit
   module Commands
   end

data/lib/rigit/commands/build.rb

@@ -138,9 +138,26 @@ module Rigit::Commands
         return if Dir.empty?(target_dir) or force
 
         dirstring = target_dir == '.' ? 'Current directory' : "Directory '#{target_dir}'"
-        continue = tty_prompt.yes? "#{dirstring} is not empty. Continue anyway?", default: false
-        raise Rigit::Exit, "Goodbye" unless continue
+        options = { "Abort" => :abort, "Continue here" => :continue, "Continue in a sub directory" => :create }
+        response = tty_prompt.select "#{dirstring} is not empty.", options, marker: '>'
+        
+        case response
+        when :abort
+          raise Rigit::Exit, "Goodbye"
+        
+        when :create
+          create_subdir
+          verify_target_dir
+        end
       end
+
+      def create_subdir
+        folder = tty_prompt.ask "Sub directory to create:", default: 'app'
+        @target_dir = "#{target_dir}/#{folder}"
+        Dir.mkdir target_dir unless Dir.exist? target_dir
+        say "Creating in #{target_dir}"
+      end
+
     end
   end
 end

data/lib/rigit/rig.rb

@@ -85,18 +85,23 @@ module Rigit
       files.reject! { |file| File.directory? file }
 
       files.each do |file|
-        target_file = (file % arguments).sub dir, target_dir
-
+        target_file = get_target_filename file, arguments, target_dir, dir
         next if block_given? and !yield target_file
-
-        begin
-          content = File.read(file) % arguments
-        rescue ArgumentError => e
-          raise TemplateError.new file, e.message
-        end
-        
+        content = get_file_content file, arguments
         File.deep_write target_file, content
       end
     end
+
+    def get_target_filename(file, arguments, target_dir, source_dir)
+      (file % arguments).sub source_dir, target_dir
+    rescue KeyError => e
+      raise TemplateError.new file, e.message
+    end
+
+    def get_file_content(file, arguments)
+      File.read(file) % arguments
+    rescue ArgumentError, KeyError => e
+      raise TemplateError.new file, e.message
+    end
   end
 end

data/lib/rigit/version.rb

@@ -1,3 +1,3 @@
 module Rigit
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rigit
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: super_docopt