simple-templater 0.1.pre → 0.2.pre

data/README.textile

@@ -33,11 +33,11 @@ You would probably want to use simple templater for your own generators, here is
 <pre>
 require "simple-templater"
 
-templater = SimpleTemplater.new(:rango)
+templater = SimpleTemplater.new(:rango, SimpleTemplater.logger)
 if defined?(Gem) # try to find generators installed as gems
   templater.discovery!
 else
-  warn "Running without RubyGems which means SimpleTemplater won't be able to find generators distributed as a Gems."
+  SimpleTemplater.logger.warn "Running without RubyGems which means SimpleTemplater won't be able to find generators distributed as a Gems."
   # register generators just for rango
   load File.join(File.dirname(__FILE__), "..", "simple-templater.scope")
 end

data/Rakefile

@@ -3,23 +3,14 @@
 require_relative "lib/simple-templater/version"
 
 # ENV setup for external commands
-ENV["RUBYLIB"] = Dir["gems/gems/*/lib"].join(":")
-$LOAD_PATH.clear.push(*Dir["gems/gems/*/lib"])
-
-# encoding
-Encoding.default_internal = "utf-8"
-Encoding.default_external = "utf-8"
+ENV["RUBYLIB"] = Dir["vendor/*/lib"].join(":")
+$LOAD_PATH.clear.push(*Dir["vendor/*/lib"])
 
 # http://support.runcoderun.com/faqs/builds/how-do-i-run-rake-with-trace-enabled
 Rake.application.options.trace = true
 
-task :bundle do
-  # NOTE: the sense of the checkout is to avoid overwriting our changes in scripts
-  exec "gem bundle --cached && git checkout script"
-end
-
 # default task for RunCodeRun.com
-task :default => [:bundle, :spec]
+task :default => ["submodules:init", :spec]
 
 # load tasks
 Dir["tasks/*.rake"].each do |taskfile|

data/deps.rip

@@ -3,4 +3,5 @@
 # Syntax:
 # repository [tag or commit to install]
 git://github.com/botanicus/cli.git 76a7985d78673426814017d6a1d6ebec2ba1bcc8
+git://github.com/botanicus/rubyexts.git 41ef70523b4b6a19cac52e6c024330103faef993
 git://github.com/genki/erubis.git b4fc63f1e75574676707768680ad72c83e77a001

data/deps.rip.rbe

@@ -3,4 +3,5 @@
 # Syntax:
 # repository [tag or commit to install]
 git://github.com/botanicus/cli.git #{commits["cli"]}
+git://github.com/botanicus/rubyexts.git #{commits["rubyexts"]}
 git://github.com/genki/erubis.git #{commits["erubis"]}

data/lib/simple-templater/builder.rb

@@ -21,7 +21,7 @@ class SimpleTemplater
   class Builder
     def self.create(*args)
       templater = self.new(*args)
-      puts("Context: #{templater.context.inspect}")
+      SimpleTemplater.logger.debug("Context: #{templater.context.inspect}")
       templater.create
     end
 
@@ -74,7 +74,7 @@ class SimpleTemplater
     end
 
     def proceed_file(template, file, local_context = Hash.new)
-      puts("Local context: #{local_context.inspect}") unless local_context.empty?
+      SimpleTemplater.logger.debug("Local context: #{local_context.inspect}") unless local_context.empty?
       FileUtils.mkdir_p(File.dirname(file))
 
       if File.directory?(template)
@@ -84,9 +84,9 @@ class SimpleTemplater
 
       if template.end_with?(".rbt")
         if File.exist?(file)
-          puts("[RETEMPLATE] #{file} (from #{template})")
+          SimpleTemplater.logger.debug("[RETEMPLATE] #{file} (from #{template})")
         else
-          puts("[TEMPLATE] #{file} (from #{template})")
+          SimpleTemplater.logger.debug("[TEMPLATE] #{file} (from #{template})")
         end
         File.open(file, "w") do |file|
           eruby = Erubis::Eruby.new(File.read(template))
@@ -95,7 +95,7 @@ class SimpleTemplater
           begin
             output = eruby.evaluate(context)
           rescue Exception => exception
-            abort "Exception occured in template #{template}: #{exception.message}"
+            SimpleTemplater.logger.error("Exception occured in template #{template}: #{exception.message}")
           end
           file.print(output)
         end
@@ -104,10 +104,10 @@ class SimpleTemplater
           # do nothing
           # it shouldn't get here never, we have File.directory? above
         elsif File.file?(file)
-          puts("[RECOPY] #{file} (from #{template})")
+          SimpleTemplater.logger.debug("[RECOPY] #{file} (from #{template})")
           FileUtils.cp_f(template, file)
         else
-          puts("[COPY] #{file} (from #{template})")
+          SimpleTemplater.logger.debug("[COPY] #{file} (from #{template})")
           FileUtils.cp(template, file)
         end
       end

data/lib/simple-templater/generator.rb

@@ -65,9 +65,9 @@ class SimpleTemplater
       if self.full? && Dir.exist?(self.target) # has to run after setup.rb hook, because setup.rb can manipulate with target
         raise TargetAlreadyExist, "#{self.target} already exist, aborting."
       end
-      puts("[#{self.name} generator] Running before hooks #{self.before_hooks.inspect}")
+      SimpleTemplater.logger.info("[#{self.name} generator] Running before hooks #{self.before_hooks.inspect}")
       self.run_hooks(:before)
-      puts("[#{self.name} generator] Creating #{@target} (#{self.config.type})")
+      SimpleTemplater.logger.info("[#{self.name} generator] Creating #{@target} (#{self.config.type})")
       if self.flat?
         # flat/content/flat.ru.rbt
         # flat/content/%user%.rb
@@ -85,9 +85,9 @@ class SimpleTemplater
 
     def run_hook(basename)
       if File.exist?(hook = file(basename))
-        puts("Running #{basename} hook")
+        SimpleTemplater.logger.info("Running #{basename} hook")
         DSL.new(self).instance_eval(File.read(hook))
-        puts("Finished")
+        SimpleTemplater.logger.info("Finished")
       end
     rescue Exception => exception
       abort "Exception #{exception.inspect} occured during running #{basename}\n#{exception.backtrace.join("\n")}"
@@ -118,7 +118,7 @@ class SimpleTemplater
       metadata_file = File.join(self.path, "metadata.yml")
       YAML::load_file(metadata_file)
     rescue Errno::ENOENT
-      abort "SimpleTemplater expected '#{metadata_file}'"
+      SimpleTemplater.logger.fatal("SimpleTemplater expected '#{metadata_file}'")
     end
 
     def config

data/lib/simple-templater/generator_set.rb

@@ -13,7 +13,7 @@ class SimpleTemplater
       @name  = name.to_sym
       @paths = check_paths(paths)
       if File.directory?(self.custom)
-        puts "Added custom generator from #{self.custom}"
+        SimpleTemplater.logger.info "Added custom generator from #{self.custom}"
         @paths.unshift(self.custom)
       end
     end

data/lib/simple-templater/helpers.rb

@@ -1,16 +1,17 @@
 # encoding: utf-8
 
 require "rbconfig"
+require "rubyexts/platform"
 
 class SimpleTemplater
   module Helpers
     extend self
 
     def shebang(executable = rubypath, *args)
-      if RUBY_PLATFORM.match(/darwin/)
-        self.env_shebang(executable, args)
-      else
+      if RubyExts::Platform.linux?
         self.plain_shebang(executable, args)
+      else
+        self.env_shebang(executable, args)
       end
     end
 

data/lib/simple-templater/hooks/hook.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require "rubyexts/string" # String#snake_case
+require "rubyexts/class"
 require "simple-templater/argv_parsing"
 
 # When generator runs:
@@ -22,26 +24,24 @@ class SimpleTemplater
     end
 
     class Hook
-      def self.hooks
-        @@hooks ||= Array.new
-      end
-
+      cattr_reader :hooks
+      @@hooks ||= Array.new
       def self.find(key)
-        self.hooks.find { |hook| hook.name.split("::").last.snake_case.to_sym == key }
+        @@hooks.find { |hook| hook.name.split("::").last.snake_case.to_sym == key }
       end
 
       def self.inherited(klass)
-        self.hooks.push(klass)
+        @@hooks.push(klass)
       end
 
       def self.invoke(context)
         hook = self.new(context)
         if hook.will_run?
-          puts("Running hook #{self}")
+          SimpleTemplater.logger.info("Running hook #{self}")
           hook.run
           return true
         else
-          puts("Skipping hook #{self}")
+          SimpleTemplater.logger.info("Skipping hook #{self}")
           return false
         end
       end

data/lib/simple-templater/version.rb

@@ -3,5 +3,5 @@
 # NOTE: Do not edit this file manually, this
 # file is regenerated by task rake version:increase
 module SimpleTemplater
-  VERSION ||= "0.0.1.4"
+  VERSION ||= "0.0.1.3"
 end

data/lib/simple-templater.rb

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby -Ivendor/erubis/lib:vendor/abstract/lib:vendor/cli/lib
+#!/usr/bin/env ruby -Ivendor/rubyexts/lib:vendor/erubis/lib:vendor/abstract/lib:vendor/cli/lib
 # encoding: utf-8
 
-require "simple-templater/core_exts"
+require "rubyexts"
 require "simple-templater/discoverer"
 require "simple-templater/generator_set"
 

data/script/spec

@@ -1,6 +1,14 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+
+Dir[File.join(File.dirname(__FILE__), "..", "vendor", "*")].each do |path|
+  if File.directory?(path) && Dir["#{path}/*"].empty?
+    warn "Dependency #{File.basename(path)} in vendor seems to be empty. Run git submodule init && git submodule update to checkout it."
+  elsif File.directory?(path) && File.directory?(File.join(path, "lib"))
+    $:.unshift File.join(path, "lib")
+  end
+end
 
 ARGV.push("spec") if ARGV.empty?
 
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/rspec-1.2.9/bin/spec")
+load File.expand_path(File.join(File.dirname(__FILE__), "..", "vendor", "rspec", "bin", "spec"))

data/simple-templater.gemspec

@@ -1,6 +1,14 @@
 #!/usr/bin/env gem build
 # encoding: utf-8
 
+Dir[File.join(File.dirname(__FILE__), "vendor", "*")].each do |path|
+  if File.directory?(path) && Dir["#{path}/*"].empty?
+    warn "Dependency #{File.basename(path)} in vendor seems to be empty. Run git submodule init && git submodule update to checkout it."
+  elsif File.directory?(path) && File.directory?(File.join(path, "lib"))
+    $:.unshift File.join(path, "lib")
+  end
+end
+
 # NOTE: we can't use require_relative because when we run gem build, it use eval for executing this file
 require File.join(File.dirname(__FILE__), "lib", "simple-templater", "version")
 
@@ -26,6 +34,7 @@ Gem::Specification.new do |s|
 
   # runtime dependencies
   s.add_dependency "cli"
+  s.add_dependency "rubyexts"
   s.add_dependency "erubis" # for generators
 
   # development dependencies

data/simple-templater.pre.gemspec

@@ -1,12 +1,20 @@
 #!/usr/bin/env gem build
 # encoding: utf-8
 
+Dir[File.join(File.dirname(__FILE__), "vendor", "*")].each do |path|
+  if File.directory?(path) && Dir["#{path}/*"].empty?
+    warn "Dependency #{File.basename(path)} in vendor seems to be empty. Run git submodule init && git submodule update to checkout it."
+  elsif File.directory?(path) && File.directory?(File.join(path, "lib"))
+    $:.unshift File.join(path, "lib")
+  end
+end
+
 # NOTE: we can't use require_relative because when we run gem build, it use eval for executing this file
 require File.join(File.dirname(__FILE__), "lib", "simple-templater", "version")
 
 Gem::Specification.new do |s|
   s.name = "simple-templater"
-  s.version = '0.1.pre'
+  s.version = '0.2.pre'
   s.authors = ["Jakub Šťastný aka Botanicus"]
   s.homepage = "http://github.com/botanicus/simple-templater"
   s.summary = "SimpleTemplater is dead-simple solution for creating generators."
@@ -26,6 +34,7 @@ Gem::Specification.new do |s|
 
   # runtime dependencies
   s.add_dependency "cli"
+  s.add_dependency "rubyexts"
   s.add_dependency "erubis" # for generators
 
   # development dependencies

data/spec/simple-templater/helpers_spec.rb

@@ -11,7 +11,7 @@ describe SimpleTemplater::Helpers do
   describe "#shebang" do
     include SimpleTemplater::Helpers
     before(:each) do
-      #RubyExts::Platform.stub!(:linux?).and_return(true)
+      RubyExts::Platform.stub!(:linux?).and_return(true)
     end
 
     it "should generate shebang with path to executable on Linux" do
@@ -19,7 +19,7 @@ describe SimpleTemplater::Helpers do
     end
 
     it "should generate shebang with /usr/bin/env on other platforms" do
-      #RubyExts::Platform.stub!(:linux?).and_return(false)
+      RubyExts::Platform.stub!(:linux?).and_return(false)
       shebang("ruby").should eql("#!/usr/bin/env ruby")
     end
 

data/spec/simple-templater/hooks/hook_spec.rb

@@ -2,6 +2,7 @@
 
 require "ostruct"
 require_relative "../../spec_helper"
+require "rubyexts/capture_io"
 require "simple-templater/hooks/hook"
 
 # factories

data/spec/simple-templater/hooks/postprocess/git_repository_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require "fileutils"
+require "rubyexts/capture_io"
 require_relative "../../../spec_helper"
 require "simple-templater/hooks/postprocess/git_repository"
 

data/spec/simple-templater_spec.rb

@@ -47,6 +47,14 @@ describe SimpleTemplater do
         SimpleTemplater.scopes.should have_key(:local)
       end
     end
+
+    describe ".logger" do
+      it "should set default logger" do
+        [:info, :debug, :error, :fatal].each do |method|
+          SimpleTemplater.logger.should respond_to(method)
+        end
+      end
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -6,39 +6,6 @@ $:.unshift(File.expand_path(File.join(SPEC_ROOT, "..", "lib")))
 require "spec" # so you can run ruby spec/rango/whatever_spec.rb
 # require "fakefs" # TODO: makes some troubles with rubyexts
 
-require "stringio"
-
-def STDOUT.capture(&block)
-  before = self
-  $stdout = StringIO.new
-  block.call
-  $stdout.rewind
-  output = $stdout.read
-  $stdout = before
-  output
-end
-
-# @example STDOUT.capture { puts "hi" }
-# # => "hi"
-def STDERR.capture(&block)
-  before = self
-  $stderr = StringIO.new
-  block.call
-  $stderr.rewind
-  output = $stderr.read
-  $stderr = before
-  output
-end
-
-# @example STDIN.capture("yes") { ask("Do you hear me?") }
-# # => "yes"
-def STDIN.capture(default, &block)
-  STDIN.reopen "/dev/null" # so we don't get the fucking prompt
-  STDIN.ungetbyte(default) # so the default value can be get by STDIN.getc & similar methods
-  block.call
-  # TODO: how I can get back the original STDIN?
-end
-
 module Spec
   module Matchers
     def match(expected)

data/stubs/project/content/%name%.gemspec.rbt

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ::Gem::Requirement.new(">= 1.9")
 
   # runtime dependencies
-  # s.add_dependency "my-gem"
+  # s.add_dependency "rubyexts"
 
   # development dependencies
   # use gem install rango --development if you want to install them

data/tasks/gem.rake

@@ -12,7 +12,7 @@ namespace :build do
     content = File.read(gemspec)
     prename = "#{gemspec.split(".").first}.pre.gemspec"
     # 0.1.1 => 0.2
-    version = SimpleTemplater::VERSION.sub(/^(\d+)\.(\d+).*$/) { "#$1.#{$2.to_i + 1}" }
+    version = SimpleTemplater::VERSION.sub(/^(\d+)\.(\d+\.){2}.*$/) { "#$1.#{$2.to_i + 1}" }
     puts "Current #{SimpleTemplater::VERSION} => #{version} pre"
     File.open(prename, "w") do |file|
       file.puts(content.gsub(/(\w+::VERSION)/, "'#{version}.pre'"))

data/tasks/spec.rake

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 desc "Run specs"
-task :spec, :spec do |task, args|
-  exec "./script/spec --options spec/spec.opts #{args.spec || "spec"}"
+task :spec, :path do |task, args|
+  exec "./script/spec --options spec/spec.opts #{args.path || "spec"}"
 end
 
 desc "Create stubs of all library files."
@@ -15,7 +15,7 @@ task "spec:stubs" do
       puts "Created #{specfile}"
     end
   end
-  (Dir.glob("spec/simple-templater/**/*.rb") + ["spec/simple-teplater_spec.rb"]).each do |file|
+  (Dir.glob("spec/simple-templater/**/*.rb") + ["spec/simple-templater_spec.rb"]).each do |file|
     libfile = file.sub(/spec/, "lib").sub(/_spec\.rb$/, '.rb')
     if !File.exist?(libfile) && File.zero?(file)
       %x[rm #{file}]

data/vendor/abstract/ChangeLog

@@ -0,0 +1,3 @@
+: release 1.0.0 (2006-03-12)
+    - first release (1.0.0)
+

data/vendor/abstract/README.txt

@@ -0,0 +1,57 @@
+= README
+
+revision::	$Rev: 1 $
+release::	$Release: 1.0.0 $
+copyright::	copyright(c) 2006 kuwata-lab.com all rights reserved.
+
+
+== Introduction
+
+'abstract.rb' is a library which enable you to define abstract method in Ruby.
+
+The followings are examples:
+
+  ## example1. (shorter notation)
+  require 'rubygems'   # if installed with 'gem install'
+  require 'abstract'
+  class Foo
+    abstract_method 'arg1, arg2=""', :method1, :method2, :method3
+  end
+  
+  ## example2. (RDoc friendly notation)
+  require 'rubygems'   # if installed with 'gem install'
+  require 'abstract'
+  class Bar
+    # ... method1 description ...
+    def method1(arg1, arg2="")
+      not_implemented
+    end
+    # ... method2 description ...
+    def method2(arg1, arg2="")
+      not_implemented
+    end
+  end
+
+
+Abstract method makes your code more descriptive.
+It is useful even for dynamic language such as Ruby.
+
+
+== Installation
+
+
+* Type 'gem install -r abstract' with root account if you have installed RubyGems.
+
+* Or type 'ruby setup.rb' with root account if you can be root account.
+
+* Or copy lib/abstract.rb into proper directory such as '/usr/local/lib/ruby/site_ruby'.
+
+
+== License
+
+Ruby's
+
+
+== Copyright
+
+copyright(c) 2006 kuwata-lab.com all rights reserved.

data/vendor/abstract/abstract.gemspec

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+###
+### RubyGems Specification file for abstract.rb
+###
+### $Rev: 1 $
+### $Release: 1.0.0 $
+### copyright(c) 2006 kuwata-lab.com all rights reserved.
+###
+
+require 'rubygems'
+
+spec = Gem::Specification.new do |s|
+  ## package information
+  s.name        = 'abstract'
+  s.author      = 'makoto kuwata'
+  s.version     = ("$Release: 1.0.0 $" =~ /[\.\d]+/) && $&
+  s.platform    = Gem::Platform::RUBY
+  s.homepage    = 'http://rubyforge.org/projects/abstract'
+  s.summary     = "a library which enable you to define abstract method in Ruby"
+  s.description = <<-'END'
+  'abstract.rb' is a library which enable you to define abstract method in Ruby.
+  END
+
+  ## files
+  files = []
+  files += Dir.glob('lib/**/*')
+  files += Dir.glob('test/**/*')
+  files += %w[README.txt ChangeLog setup.rb abstract.gemspec]
+  #s.files       = files.delete_if { |path| path =~ /\.svn/ }
+  s.files       = files
+  s.test_file   = 'test/test.rb'
+end
+
+# Quick fix for Ruby 1.8.3 / YAML bug   (thanks to Ross Bamford)
+if (RUBY_VERSION == '1.8.3')
+   def spec.to_yaml
+      out = super
+      out = '--- ' + out unless out =~ /^---/
+      out
+   end
+end
+
+if $0 == __FILE__
+  Gem::manage_gems
+  Gem::Builder.new(spec).build
+end
+