another 0.0.3 → 0.0.4

data/another.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{another}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pat Nakajima"]
@@ -10,7 +10,9 @@ Gem::Specification.new do |s|
   s.default_executable = %q{another}
   s.email = %q{patnakajima@gmail.com}
   s.executables = ["another"]
-  s.files = Dir["./**/**/**/**"] << File.join(*%w[. templates lib PROJECT .gitignore])
+  s.files = Dir.glob('**/**/**/**/**/**', File::FNM_DOTMATCH) \
+    .reject { |f| f =~ /\.git\// } \
+    .reject { |f| f =~ /^\.{1,2}$/ }
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.0}
   s.summary = %q{My new Ruby project generator}

data/lib/another/confirmer.rb

@@ -0,0 +1,18 @@
+module Another
+  module Confirmer
+    def confirmed?
+      say "Warning: Creating new projects makes you vulnerable to mockery.".bold
+      answer ? true : begin
+        say "Probably for the best."
+      end
+    end
+    
+    private
+    
+    def answer
+      ask "Are you sure you want to create a new project? ".bold do |answer|
+        answer =~ /^y/i
+      end
+    end
+  end
+end

data/lib/another/options.rb

@@ -0,0 +1,44 @@
+require 'optparse'
+require 'ostruct'
+
+module Another
+  class Options
+    attr_reader :template, :project_name, :target
+    
+    def initialize(args)
+      @args = args.dup
+      process!
+    end
+
+    private
+    
+    def process!
+      options = OpenStruct.new
+      options.template = "ruby"
+
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: another [options] project-name"
+
+        opts.on("-t", "--template TEMPLATE", "Specify a template (default: Ruby)") do |template|
+          options.template = template
+        end
+
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit!
+        end
+      end
+
+      opts.parse!(@args)
+
+      if @args.empty?
+        puts opts
+        exit!
+      else
+        @target       = @args.shift
+        @template     = options.template
+        @project_name = File.basename(target)
+      end
+    end
+  end
+end

data/lib/another/runner.rb

@@ -1,71 +1,86 @@
 module Another
   class Runner
+    attr_reader :options
+    
+    include Another::Confirmer
+    
     def initialize(args)
-      @args = args
-      return if test_mode?
-      return puts("Probably for the best.") unless confirmed?
-      say "Copying files..."
-      FileUtils.mkdir target_directory
-      Dir[File.join(template_directory, "**", "**")].each do |file|
-        copy!(file.split('/templates/').last)
+      @options = Options.new(args)
+    end
+    
+    def perform!
+      @performing = true
+      
+      return unless confirmed?
+      
+      say "Copying files for #{template}..."
+
+      manifest.each do |file|
+        copy!(file)
       end
+      
       say "done!"
     end
     
-    def confirmed?
-      say "Warning: Creating new projects makes you vulnerable to mockery.".bold
-      ask "Are you sure you want to create a new project? ".bold do |answer|
-        answer =~ /^y/i
-      end
+    def manifest
+      File.read(template_path('manifest.txt')).split(/\n+/).reject(&:blank?)
     end
     
-    def test_mode?
-      defined?(Spec)
+    def target
+      options.target
     end
     
     def project_name
-      @args.first
+      options.project_name
+    end
+    
+    def template
+      options.template
     end
     
     def module_name
-      project_name.gsub(/\W+/, '_').split('_').map(&:capitalize).join
+      project_name.split(/\W/).map(&:capitalize).join
     end
     
-    def target_directory(path='')
-      File.expand_path \
-        [
-          Dir.pwd,
-          project_name,
-          path \
-            .gsub('PROJECT', project_name.gsub(/\W+/, '_')) \
-            .sans('.erb')
-        ].compact.join("/")
+    def target_path(path='')
+      File.expand_path File.join(
+        Dir.pwd,
+        target,
+        path.gsub('PROJECT', project_name.gsub(/\W+/, '_')))
     end
     
-    def template_directory(path='')
-      File.join(File.dirname(__FILE__), *%W[.. .. templates #{path}])
+    def template_path(path='')
+      File.expand_path File.join(File.dirname(__FILE__), *%W[.. .. templates #{template} #{path}])
     end
     
     def copy!(path)
       begin
         read(path) \
           .erb_eval(binding) \
-          .write(target_directory(path))
+          .write(target_path(path))
+      rescue Errno::ENOENT => e
+        raise e if File.exists?(target_path)
+        FileUtils.mkdir_p(target_path)
+        retry
       rescue Errno::EISDIR
-        FileUtils.mkdir target_directory(path)
+        FileUtils.mkdir_p target_path(path)
       end
     end
     
+    def performing?
+      @performing
+    end
+    
     def read(path)
-      File.read(template_directory(path))
+      File.read(template_path(path))
     end
     
     def say(msg)
-      puts(msg) unless test_mode?
+      puts(msg) if performing?
     end
     
     def ask(msg)
-      print msg unless test_mode?
+      print msg if performing?
       yield $stdin.gets.chomp
     end
   end

data/lib/another.rb

@@ -1,10 +1,10 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), *%w[core_ext])
 $LOAD_PATH << File.join(File.dirname(__FILE__), *%w[another])
 
-%w[rubygems colored fileutils string symbol runner].each { |lib| require lib }
+%w[rubygems colored fileutils string symbol options confirmer runner].each { |lib| require lib }
 
 module Another
   def self.run(args)
-    Runner.new(args)
+    Runner.new(args).perform!
   end
 end

data/lib/core_ext/string.rb

@@ -6,13 +6,21 @@ class String
   end
   
   def write(path)
-    puts "- #{path}"
-    File.open(path, 'w') do |file|
+    File.open(path, 'w+') do |file|
       file << self
     end
+    puts "- #{path}"
   end
   
   def sans(str)
     gsub(str, '')
   end
+  
+  def blank?
+    gsub(/\t|\s/, '').empty?
+  end
+  
+  def underscore
+    gsub(/\W+/, '_')
+  end
 end

data/spec/another_spec.rb

@@ -2,31 +2,60 @@ require 'spec/spec_helper'
 
 describe Another do
   it "runs" do
-    mock(Another::Runner).new(['one-more'])
+    mock(runner = Object.new).perform!
+    mock(Another::Runner).new(['one-more']).returns(runner)
     Another.run(['one-more'])
   end
   
   describe Another::Runner do
     attr_reader :runner
     
-    before(:each) do
-      @runner = Another::Runner.new(['one-more'])
-    end
-    
-    it "gets project_name" do
-      runner.project_name.should == 'one-more'
-    end
-    
-    it "gets module name" do
-      runner.module_name.should == 'OneMore'
+    describe "basics" do
+      before(:each) do
+        @runner = Another::Runner.new(['one-more'])
+      end      
+      
+      it "gets project_name" do
+        runner.project_name.should == 'one-more'
+      end
+
+      it "gets module name" do
+        runner.module_name.should == 'OneMore'
+      end
+
+      it "get target_path" do
+        stub(Dir).pwd { '/User/foo' }
+        runner.target_path.should == '/User/foo/one-more'
+      end
     end
     
-    it "get target_directory" do
-      stub(Dir).pwd { '/User/foo' }
-      runner.target_directory.should == '/User/foo/one-more'
+    describe "template options" do
+      context "when no option specified" do
+        before(:each) do
+          @runner = Another::Runner.new(['one-more'])
+        end
+        
+        it "is ruby" do
+          runner.template.should == 'ruby'
+        end
+      end
+      
+      context "when --sinatra" do
+        before(:each) do
+          @runner = Another::Runner.new(['one-more', '--template', 'sinatra'])
+        end
+        
+        it "is ruby" do
+          runner.template.should == 'sinatra'
+        end
+      end
     end
     
     describe "confirmation" do
+      before(:each) do
+        @runner = Another::Runner.new(['one-more'])
+      end
+      
       context "when yes" do
         it "is confirmed" do
           stub($stdin).gets { "y" }

data/templates/ruby/manifest.txt

@@ -0,0 +1,8 @@
+./lib
+./lib/PROJECT
+./lib/PROJECT/.gitignore
+./lib/PROJECT.rb
+./README.textile
+./spec
+./spec/PROJECT_spec.rb
+./spec/spec_helper.rb

data/templates/sinatra/app.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'sinatra'
+
+get '/' do
+  "Hello!"
+end

data/templates/sinatra/manifest.txt

@@ -0,0 +1,9 @@
+./app.rb
+./public
+./public/.gitignore
+./spec
+./spec/PROJECT_spec.rb
+./spec/spec_helper.rb
+./spec/.gitignore
+./views
+./views/.gitignore

data/templates/sinatra/spec/PROJECT_spec.rb

@@ -0,0 +1,12 @@
+require 'spec/spec_helper'
+ 
+describe 'the app' do
+  include Elementor
+  
+  attr_reader :response, :page, :first
+  
+  it "should not blow up" do
+    get_it '/'
+    response.should be_ok
+  end
+end

data/templates/sinatra/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+ARGV.clear
+ 
+require 'rubygems'
+require 'spec'
+require 'sinatra'
+require 'sinatra/test/rspec'
+
+require File.join(File.dirname(__FILE__), *%w[.. app])
+
+# For view tests
+require 'elementor'
+require 'elementor/spec'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: another
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -31,29 +31,73 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- ./another.gemspec
-- ./bin
-- ./bin/another
-- ./lib
-- ./lib/another
-- ./lib/another/runner.rb
-- ./lib/another.rb
-- ./lib/core_ext
-- ./lib/core_ext/string.rb
-- ./lib/core_ext/symbol.rb
-- ./README
-- ./spec
-- ./spec/another_spec.rb
-- ./spec/spec_helper.rb
-- ./templates
-- ./templates/lib
-- ./templates/lib/PROJECT
-- ./templates/lib/PROJECT.rb.erb
-- ./templates/README.textile
-- ./templates/spec
-- ./templates/spec/PROJECT_spec.rb.erb
-- ./templates/spec/spec_helper.rb.erb
-- ./templates/lib/PROJECT/.gitignore
+- .git
+- another.gemspec
+- bin
+- bin/.
+- bin/..
+- bin/another
+- lib
+- lib/.
+- lib/..
+- lib/another
+- lib/another/.
+- lib/another/..
+- lib/another/confirmer.rb
+- lib/another/options.rb
+- lib/another/runner.rb
+- lib/another.rb
+- lib/core_ext
+- lib/core_ext/.
+- lib/core_ext/..
+- lib/core_ext/string.rb
+- lib/core_ext/symbol.rb
+- README
+- spec
+- spec/.
+- spec/..
+- spec/another_spec.rb
+- spec/spec_helper.rb
+- templates
+- templates/.
+- templates/..
+- templates/ruby
+- templates/ruby/.
+- templates/ruby/..
+- templates/ruby/lib
+- templates/ruby/lib/.
+- templates/ruby/lib/..
+- templates/ruby/lib/PROJECT
+- templates/ruby/lib/PROJECT/.
+- templates/ruby/lib/PROJECT/..
+- templates/ruby/lib/PROJECT/.gitignore
+- templates/ruby/lib/PROJECT.rb
+- templates/ruby/manifest.txt
+- templates/ruby/README.textile
+- templates/ruby/spec
+- templates/ruby/spec/.
+- templates/ruby/spec/..
+- templates/ruby/spec/PROJECT_spec.rb
+- templates/ruby/spec/spec_helper.rb
+- templates/sinatra
+- templates/sinatra/.
+- templates/sinatra/..
+- templates/sinatra/app.rb
+- templates/sinatra/manifest.txt
+- templates/sinatra/public
+- templates/sinatra/public/.
+- templates/sinatra/public/..
+- templates/sinatra/public/.gitignore
+- templates/sinatra/spec
+- templates/sinatra/spec/.
+- templates/sinatra/spec/..
+- templates/sinatra/spec/.gitignore
+- templates/sinatra/spec/PROJECT_spec.rb
+- templates/sinatra/spec/spec_helper.rb
+- templates/sinatra/views
+- templates/sinatra/views/.
+- templates/sinatra/views/..
+- templates/sinatra/views/.gitignore
 has_rdoc: false
 homepage: 
 post_install_message: