Improved generator w/ template support

.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 *.DS_Store
 *.sass-cache
+*.gem

Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in kickster.gemspec
 gemspec

README.md

@@ -1,4 +1,5 @@
-# kickster
+Kickster
+========
 
 Jekyll starter template with GitHub Pages deploy to kickstart your project.
 

bin/kickster

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/kickster.rb'
-
+require File.dirname(__FILE__) + "/../lib/kickster.rb"
 Kickster::Generator.start

kickster.gemspec

@@ -1,6 +1,9 @@
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "kickster/version"
+
 Gem::Specification.new do |spec|
   spec.name          = "kickster"
-  spec.version       = "0.1.3"
+  spec.version       = Kickster::VERSION
   spec.platform      = Gem::Platform::RUBY
   spec.author        = "Nielsen Ramon"
   spec.summary       = "Hassle-free deploying to GitHub Pages with Jekyll."
@@ -10,10 +13,10 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split("\n")
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency("thor")
+  spec.add_runtime_dependency("thor", "~> 0")
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
 end

lib/kickster.rb

@@ -1,2 +1,6 @@
-require "kickster/generator"
-require "kickster/version"
+require_relative "kickster/version"
+require_relative "kickster/install"
+require_relative "kickster/generator"
+
+module Kickster
+end

lib/kickster/generator.rb

@@ -1,62 +1,16 @@
-require "fileutils"
-require "erb"
-require "kickster/version"
-require "pathname"
 require "thor"
 
 module Kickster
   class Generator < Thor
-    map ['-v', '--version'] => :version
+    include Thor::Actions
 
-    desc 'new', 'Create new folder with the Kickster template'
-    method_options :path => :string, :force => :boolean
-    def new(name)
-      if kickster_files_already_exist?(name) && !options[:force]
-        puts "Folder already exist, use --force to overwrite."
-      else
-        install_files(name)
-        puts "Kickster template folder successfully created!"
-      end
-    end
+    map ["-v", "--version"] => :version
 
-    desc 'version', 'Show Kickster version'
+    desc "version", "Show Kickster version"
     def version
-      say "kickster-#{Kickster::VERSION}"
-    end
-
-    private
-
-    def kickster_files_already_exist?(name)
-      install_path(name).exist?
-    end
-
-    def install_path(name)
-      @install_path ||= if options[:path]
-        Pathname.new(File.join(options[:path], name))
-        erb = ERB.new(File.read("config.yml"))
-        site_name = name
-        puts erb.result(site_name)
-      else
-        Pathname.new(name)
-      end
-    end
-
-    def install_files(name)
-      FileUtils.mkdir_p(install_path(name))
-      FileUtils.cp_r(template_files, install_path(name))
-
-    end
-
-    def template_files
-      Dir["#{template_directory}/."]
+      say "Kickster #{Kickster::VERSION}"
     end
 
-    def template_directory
-      File.join(top_level_directory, "template")
-    end
-
-    def top_level_directory
-      File.dirname(File.dirname(File.dirname(__FILE__)))
-    end
+    register(Kickster::Install, "new", "new", "Create new folder with the Kickster template")
   end
 end

lib/kickster/install.rb

@@ -0,0 +1,41 @@
+require "thor"
+
+module Kickster
+  class Install < Thor::Group
+    include Thor::Actions
+
+    argument :name
+    class_options force: :boolean
+
+    def self.source_root
+      File.expand_path("../../../template", __FILE__)
+    end
+
+    def name_components
+      @_name_components ||= name.scan(/[[:alnum:]]+/)
+    end
+
+    def snake_name
+      @_snake_name = name_components.map(&:downcase).join("_")
+    end
+
+    def camel_name
+      @_camel_name = name_components.map(&:capitalize).join("")
+    end
+
+    def check_if_exists?
+      if File.directory?(snake_name) && !options[:force]
+        say "Folder already exist, use --force to overwrite.", :red
+        exit 1
+      end
+    end
+
+    def copy_templates
+      directory("./", "./#{snake_name}")
+    end
+
+    def report_success
+      say "Kickster template folder successfully created!", :green
+    end
+  end
+end

lib/kickster/version.rb

@@ -1,3 +1,3 @@
 module Kickster
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

template/README.md → template/README.md.tt

@@ -1,5 +1,4 @@
-kickster
-========
+# <%= camel_name %>
 
 Jekyll starter template with GitHub Pages deploy to kickstart your project.
 

template/_config.yml → template/_config.yml.tt

@@ -1,5 +1,5 @@
 permalink: pretty
-name: <%= site_name %>
+name: <%= snake_name %>
 
 exclude:
   - .bowerrc

template/bower.json → template/bower.json.tt

@@ -1,5 +1,5 @@
 {
-  "name": "kickster",
+  "name": "<%= snake_name %>",
   "dependencies": {
     "jquery": "~1.11.2"
   }