rag 1.0.7 → 1.1.0

data/.gitignore

@@ -3,3 +3,4 @@
 /vendor
 /tmp
 /rfrom
+*.gem

data/Gemfile

@@ -1,8 +1,14 @@
 source :rubygems
 
-#gem 'tagen', :path => '/home/guten/dev/rb/tagen', :require => 'tagen/core'
-gem 'tagen', '~>1.0.0', :require => 'tagen/core'
-gem 'pa', '~>1.0.0'
+gem 'tagen', '~>1.1.0', :require => 'tagen/core'
+#gem 'tagen', :path => '/home/guten/dev/one/tagen', :require => 'tagen/core'
+
+#gem 'pa', '~>1.1.0'
+gem 'pa', :path => '/home/guten/dev/one/pa'
+
+#gem 'optimism', '~>3.0.0'
+gem 'optimism', :path => '/home/guten/dev/one/optimism'
+
 gem 'thor', '~>0.14.0'
 
 group :development do
@@ -10,5 +16,3 @@ group :development do
 	gem 'watchr'
 	gem 'yard'
 end
-
-#gemspec

data/Gemfile.lock

@@ -1,32 +1,44 @@
+PATH
+  remote: /home/guten/dev/one/optimism
+  specs:
+    optimism (3.1.0)
+      hike (~> 1.2.0)
+
+PATH
+  remote: /home/guten/dev/one/pa
+  specs:
+    pa (1.1.4)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.8)
-    diff-lcs (1.1.2)
-    pa (1.0.0)
-    pd (1.0.1)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    hike (1.2.1)
+    multi_json (1.0.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    tagen (1.0.2)
-      activesupport
-      pd
+    rspec-mocks (2.8.0)
+    tagen (1.1.2)
+      activesupport (~> 3.1.0)
     thor (0.14.6)
     watchr (0.7)
-    yard (0.6.5)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pa (~> 1.0.0)
+  optimism!
+  pa!
   rspec
-  tagen (~> 1.0.0)
+  tagen (~> 1.1.0)
   thor (~> 0.14.0)
   watchr
   yard

data/README.md

@@ -1,18 +1,21 @@
 Rag, a project helper
 =====================
 
-**Homepage**: [https://github.com/GutenYe/rag](https://github.com/GutenYe/rag) <br/>
-**Author**:	Guten <br/>
-**License**: MIT-LICENSE <br/>
-**Documentation**: [http://rubydoc.info/gems/rag/frames](http://rubydoc.info/gems/rag/frames) <br/>
-**Issue Tracker**: [https://github.com/GutenYe/rag/issues](https://github.com/GutenYe/rag/issues) <br/>
+| Homepage:      |  https://github.com/GutenYe/rag       |
+|----------------|---------------------------------------|
+| Author:	       | Guten                                 |
+| License:       | MIT-LICENSE                           |
+| Documentation: | http://rubydoc.info/gems/rag/frames   |
+| Issue Tracker: | https://github.com/GutenYe/rag/issues |
 
-Overview
---------
+a project helper, include create, develop, test and release.
 
-a project helper, include create, develop, test, release.
+Features
+--------
 
-depends Gemfile.
+* easy to extend.
+* use thor as default task DSL.
+* with vim support. see resources 
 
 Usage
 -----
@@ -26,14 +29,6 @@ Usage
 
 	rag release # build gem and push to Ruygems
 
-
-Features
---------
-
-* easy to extend.
-* use thor as default task DSL.
-* with vim support. see resources 
-
 Configuration
 -------------
 
@@ -68,7 +63,7 @@ in Ragfile
 
 	require 'rag/foo'
 
-avaliable variable for writing extension. they are read from .gemspec file
+available variable for writing extension. they are read from .gemspec file
 
 	Rc.o.project  # project name
 	Rc.o.version
@@ -77,34 +72,33 @@ avaliable variable for writing extension. they are read from .gemspec file
 Template
 --------
 
-from system-level: GEM(rag)/template and user-level: ~/.rag/template
+template path: ~/.rag/
 
-template/foo/a.erb
+~/.rag/foo/a.erb
 
 	<%=project%>
 
 local variables in erb file are from ~/.ragrc and APP/.ragrc
 
-default template see {file:template/default.readme}
-
-Contributing
--------------
-
-* report bugs/featues to issue tracker.
-* fork it and pull a request.
-* improve documentation.
-* feel free to post any ideas. 
-
 Install
 ----------
 
-	gem install --no-wrappers rag
-	gem update --no-wrappers rag
+	gem install rag
 
-or you can write `gem: --no-wrappers` into ~/.gemrc file, then
+Note on Patches/Pull Requests
+-----------------------------
 
-	gem install rag
-	gem update rag
+1. Fork the project.
+2. Make your feature addition or bug fix.
+3. Add tests for it. This is important so I don't break it in a future version unintentionally.
+4. Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+5. Send me a pull request. Bonus points for topic branches.
+6. Coding Style Guide: https://gist.github.com/1105334
+
+Contributors
+------------
+
+* [contributors](https://github.com/GutenYe/rag/contributors)
 
 Resources
 ---------
@@ -115,4 +109,13 @@ Resources
 
 Copyright
 ---------
-Copyright &copy; 2011 by Guten. this library released under MIT-LICENSE, See {file:LICENSE} for futher details.
+
+(the MIT License)
+
+Copyright (c) 2011 Guten
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/rag

@@ -1,20 +1,26 @@
 #!/usr/bin/env ruby
-require_relative "../lib/rag"
 
-# default plugin
-require_relative "../lib/rag/new"
-require_relative "../lib/rag/gem"
-require_relative "../lib/rag/doc"
-require_relative "../lib/rag/test"
+require_relative "../lib/rag"
 
 # load Ragfile
-if Pa.exists? "Ragfile"
+if Pa.exists?("Ragfile")
 	load "Ragfile"
 end
 
 # load tasks/*.rag
-Pa.glob 'tasks/*.rag' do |pa|
+Pa.glob("tasks/*.rag") { |pa|
 	load pa.path
+}
+
+begin
+  Rag.start
+rescue Rag::RagError => e
+  Rag.ui.error e.message
+  Rag.ui.debug e.backtrace.join("\n")
+  exit 1
+rescue Interrupt => e
+  Rag.ui.error "\nQuitting..."
+  Rag.ui.debug e.backtrace.join("\n")
+  exit 1
 end
 
-Rag.start

data/data/home_config/_ragrc

@@ -1,8 +1,8 @@
-author: XX
-email: XX
-license: XX
+author = 'XX'
+email = 'XX'
+license = 'XX'
 
 github:
-  username: XX
+  username = 'XX'
 
-# vim: filetype=yaml
+# vim: filetype=ruby

data/lib/rag.rb

@@ -1,8 +1,42 @@
-require "tagen/core"
-require "pa"
-require "thor"
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+require "bundler/setup"
+Bundler.require
 
 class Rag < Thor
+  Error = Class.new Exception
+  RagError = Class.new Exception
+
+  autoload :VERSION, "rag/version"
+  autoload :UI, "rag/ui"
+  autoload :Util, "rag/util"
+
+  Rc = Optimism.require "rag/rc", "~/.ragrc"
+
+	include Thor::Actions
+
+	class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
+	class_option "verbose",  :type => :boolean, :banner => "Enable verbose output mode", :aliases => "-V"
+
+  class << self
+    attr_accessor :ui
+
+		def ui
+			@ui ||= UI::Base.new
+		end
+  end
+
+	def initialize(*)
+		super
+		the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
+		Rag.ui = UI::Shell.new(the_shell)
+		Rag.ui.debug! if options["verbose"]
+	end
 end
 
-require_relative "rag/rc"
+require "rag/new"
+require "rag/gem"
+require "rag/test"
+require "rag/doc"

data/lib/rag/gem.rb

@@ -1,23 +1,21 @@
 class Rag < Thor
-
 	desc "release", "release this gem to RubyGems.org"
 	def release
-		system "gem build #{Rc.o.project}.gemspec", :verbose
-		system "gem push #{Rc.o.project}-#{Rc.o.version}.gem", :verbose
-		Pa.rm "#{Rc.o.project}-#{Rc.o.version}.gem", verbose: true
+		system "gem build #{Rc.o.project}.gemspec", :verbose => true
+		system "gem push #{Rc.o.project}-#{Rc.o.version}.gem", :verbose => true
+		Pa.rm "#{Rc.o.project}-#{Rc.o.version}.gem", :verbose => true
 	end
 
 	desc "install", "install this gem to your system"
 	def install
 		sudo = Process.uid == 0 ? "" : "sudo"
-		system "gem build #{Rc.o.project}.gemspec", :verbose
-		system "#{sudo} gem install #{Rc.o.project}-#{Rc.o.version}.gem", :verbose
-		Pa.rm "#{Rc.o.project}-#{Rc.o.version}.gem", verbose: true
+		system "gem build #{Rc.o.project}.gemspec", :verbose => true
+		system "#{sudo} gem install #{Rc.o.project}-#{Rc.o.version}.gem", :verbose => true
+		Pa.rm "#{Rc.o.project}-#{Rc.o.version}.gem", :verbose => true
 	end
 
 	desc "build", "build this gem at current directory "
 	def build
-		system "gem build #{Rc.o.project}.gemspec", :verbose
+		system "gem build #{Rc.o.project}.gemspec", :verbose => true
 	end
-
 end

data/lib/rag/new.rb

@@ -1,39 +1,156 @@
-require_relative "new/project"
-
-class Rag  < Thor
-	desc "new <project_name> or new .", "create a new project or use current directory"
-	method_option "author", 		type: :string, banner: "NAME", desc: "the project's author name"
-	method_option "email", 			type: :string, desc: "author's email address"
-	method_option "template", 	type: :string, default: "default", banner: "NAME", desc: "which template to use"
-	method_option "name", 			type: :string, banner: "NAME", desc: "rag new . [--name hello] default from File.basename(cur_path)"
-	method_option "list", 			type: :boolean, desc: "list templates", aliaes: %w(-l)
-	def new name
-		if options.list?
-			Project.list_templates
-		end
-
-		check_first_time
-
-		Project.create name, options
+class Rag # ::Project
+=begin
+
+== ERB support variables
+* project 		# the name of your project, provided by `rag new <project_name>"
+* others from .ragrc 
+
+== Configrauton
+
++ ~/.ragrc 
++ APP/.ragrc 
++ from cmdline
+
+you can use arbitrary name in .ragrc, then you can use then in template file.
+
+=end
+  class Project
+    class << self
+      def create(*args)
+        Project.new(*args).create
+      end
+    end
+
+    attr_reader :options, :template, :app_path
+    def initialize(template, app_path, o={})
+      @template = template
+      @options = o
+      o["name"] ||= Pa.absolute(app_path).fname 
+      o["class_name"] ||= o["name"].capitalize
+      @app_path = Pa(app_path)
+    end
+
+    def create
+      create_project_directory
+      if @app_path == "."
+        copy_files
+      else
+        copy_files :overwrite => true
+      end
+    end
+
+  private
+    def create_project_directory
+      if @app_path == "."
+        return
+      elsif app_path.exists?
+        puts "dest directory `#{app_path}' already existing"
+        exit
+      else
+        Pa.mkdir app_path
+      end
+    end
+
+    def template_path
+      pa1 = Pa("#{Rc.p.home}/#{template}")
+      return pa1.p if pa1.exists?
+
+      raise Error, "can't find template -- #{template}"
+    end
+
+    def copy_files(o={})
+      Pa.each_r template_path do |pa, relative, e|
+        # skip *~
+        next if pa.fn2 =~ /~$/
+
+        # convert __project__ to options["name"]
+        dest = app_path.join(relative.gsub(/__project__/, options["name"]))
+        path_msg = relative.gsub(/__project__/, options["name"]).gsub(/\.erb$/,"")
+
+        # skip directory not file
+        next if dest.exists? and dest.directory? 
+
+        if not o[:overwrite] and (dest.exists? or dest.sub(/\.erb$/, "").exists?)
+          print "Overwrite #{path_msg}? [yna] "
+          case $stdin.gets.rstrip
+          when "y"
+            puts "[overwrite] #{path_msg}"
+            copy_file pa, dest, o
+          when "a"
+            puts "[overwrite] #{path_msg}"
+            o[:overwrite] = true
+            copy_file pa, dest, o
+          when "q"
+            exit
+          else
+            puts "[skip] #{path_msg}"
+            next
+          end
+        elsif o[:overwrite] and dest.exists?
+          puts "[overwrite] #{path_msg}"
+          copy_file pa, dest, o
+        else
+          # classify: file dir/
+          puts "[create] #{path_msg}" + (dest.directory? ? "/" : "")
+          copy_file pa, dest, o
+        end
+
+      end
+    end
+
+    # not rescurive copy
+    def copy_file(src, dest, o)
+      if src.e == "erb"
+        copy_erb_file src, dest.sub(/\.erb$/,"")
+      else
+        Pa.cp src, dest, o.merge(special: true)
+      end
+    end
+
+    def copy_erb_file(src, dest)
+      result = Util::ERB.new(File.read(src.p)).result(binding, get_erb_config)
+      File.write dest.p, result
+      dest.chmod(src.stat.mode)
+    end
+
+    def get_erb_config
+      config = Optimism.require(Rc.p.apprc.p, Rc.p.homerc.p) + Optimism[options]
+      config["project"] = options["name"]
+      config["klass"] = options["class_name"]
+      config["template"] = @template
+
+      config._data
+    end
+  end
+end
+
+class Rag < Thor
+	desc "new <template> <app_path>", "create a new project"
+  method_option "name", :aliases => "-n", :type => :string, :banner => "NAME", :desc => "another name"
+  method_option "class_name", :aliases => "-c", :type => :string, :banner => "CLASS_NAME", :desc => "another class name"
+	def new(template, app_path)
+		check_first_time!
+
+		Project.create template.dup, app_path.dup, options.dup
 	end
 
-	private
-	def check_first_time
+private
+	def check_first_time!
  		return unless first_time?
 
 		puts "first time run rag"
-		(Rc.pa.data+'/home_config').each do |src|
-			dest = '~/' + src.b.sub(/^_/, '.')
+    Pa.each("#{Rc.p.data}/home_config") { |src|
+			dest = "~/" + src.b.sub(/^_/, ".")
 			puts "[create] #{dest.short}"
 			Pa.cp src, dest
-		end
+    }
+
 		puts "exit."
 		puts "please edit ~/.ragrc config file, then run rag again"
 		exit
 	end
 
 	def first_time?
-		Rc.pa.config.exists? ? false : true
+		Rc.p.homerc.exists? ? false : true
 	end
-
 end