ronin-gen 1.0.0 → 1.0.1.rc1

data/ChangeLog.md

@@ -1,3 +1,15 @@
+### 1.0.1 / 2011-05-17
+
+* Require data_paths ~> 0.3.
+* Require ronin-support ~> 0.2.
+* Require ronin ~> 1.1.
+* Include `Ronin::AutoLoad` into {Ronin::Gen::Generators}.
+* Ensure that {Ronin::Gen::Generators::Library} executes `git` commands
+  within the destination directory.
+* Have {Ronin::Gen::Generators::Library} call `git add .` then `git commit`.
+* Make sure that {Ronin::Gen::Generators::Repository} creates the new
+  `scripts/` directory.
+
 ### 1.0.0 / 2011-03-25
 
 * Upgraded to the GPL-3 license.

data/Gemfile

@@ -7,8 +7,8 @@ RONIN_URI = 'http://github.com/ronin-ruby'
 gemspec
 
 # Ronin dependencies:
-# gem 'ronin-support',	'~> 0.1.0', :git => "#{RONIN_URI}/ronin-support.git"
-# gem 'ronin',		      '~> 1.0.0', :git => "#{RONIN_URI}/ronin.git"
+# gem 'ronin-support',	'~> 0.2', :git => "#{RONIN_URI}/ronin-support.git"
+# gem 'ronin',		      '~> 1.1', :git => "#{RONIN_URI}/ronin.git"
 
 group :development do
   gem 'rake',		      '~> 0.8.7'
@@ -17,3 +17,24 @@ group :development do
   gem 'ore-tasks',	  '~> 0.4'
   gem 'rspec',		    '~> 2.4'
 end
+
+#
+# To enable additional DataMapper adapters for development work or for
+# testing purposes, simple set the ADAPTER or ADAPTERS environment
+# variable:
+#
+#     export ADAPTER="postgres"
+#     bundle install
+#
+#     ./bin/ronin --database postgres://ronin@localhost/ronin
+#
+require 'set'
+
+DM_ADAPTERS = Set['postgres', 'mysql', 'oracle', 'sqlserver']
+
+adapters = (ENV['ADAPTER'] || ENV['ADAPTERS']).to_s
+adapters = Set.new(adapters.to_s.tr(',',' ').split)
+
+(DM_ADAPTERS & adapters).each do |adapter|
+  gem "dm-#{adapter}-adapter", DM_VERSION #, :git => "#{DM_URI}/dm-#{adapter}-adapter.git"
+end

data/README.md

@@ -37,13 +37,13 @@ Generate a skeleton Overlay:
 * [open_namespace](http://github.com/postmodern/open_namespace#readme)
   ~> 0.3
 * [data_paths](http://github.com/postmodern/data_paths#readme)
-  ~> 0.2, >= 0.2.1
+  ~> 0.3
 * [thor](http://github.com/wycats/thor#readme)
   ~> 0.14.3
 * [ronin-support](http://github.com/ronin-ruby/ronin-support#readme)
-  ~> 0.1.0
+  ~> 0.2
 * [ronin](http://github.com/ronin-ruby/ronin#readme)
-  ~> 1.0.0
+  ~> 1.1
 
 ## Install
 

data/data/ronin/gen/library/Gemfile.erb

@@ -10,10 +10,31 @@ gemspec
 # gem 'ronin-gen',      '~> <%= Ronin::Gen::VERSION %>', :git => "#{RONIN_URI}/ronin-gen.git"
 <%- end -%>
 
-group(:development) do
+group :development do
   gem 'rake',         '~> 0.8.7'
   gem 'kramdown',     '~> 0.12'
 
   gem 'ore-tasks',    '~> 0.4'
   gem 'rspec',        '~> 2.4'
 end
+
+#
+# To enable additional DataMapper adapters for development work or for
+# testing purposes, simple set the ADAPTER or ADAPTERS environment
+# variable:
+#
+#     export ADAPTER="postgres"
+#     bundle install
+#
+#     ./bin/ronin --database postgres://ronin@localhost/ronin
+#
+require 'set'
+
+DM_ADAPTERS = Set['postgres', 'mysql', 'oracle', 'sqlserver']
+
+adapters = (ENV['ADAPTER'] || ENV['ADAPTERS']).to_s
+adapters = Set.new(adapters.to_s.tr(',',' ').split)
+
+(DM_ADAPTERS & adapters).each do |adapter|
+  gem "dm-#{adapter}-adapter", DM_VERSION #, :git => "#{DM_URI}/dm-#{adapter}-adapter.git"
+end

data/data/ronin/gen/library/Rakefile

@@ -26,5 +26,4 @@ RSpec::Core::RakeTask.new
 task :default => :spec
 
 require 'yard'
-YARD::Rake::YardocTask.newrequire 'rubygems'
-require 'bundler'
+YARD::Rake::YardocTask.new

data/gemspec.yml

@@ -13,11 +13,13 @@ requirements: git >= 1.6.0.0, for the library generator
 
 dependencies:
   open_namespace: ~> 0.3
-  data_paths: ~> 0.2, >= 0.2.1
+  # data_paths: ~> 0.3
+  data_paths: ~> 0.3.0.rc1
   thor: ~> 0.14.3
   # Ronin dependencies:
-  ronin-support: ~> 0.1.0
-  ronin: ~> 1.0.0
+  ronin-support: ~> 0.2.0.rc1
+  # ronin: ~> 1.1
+  ronin: ~> 1.1.0.rc1
 
 development_dependencies:
   bundler: ~> 1.0.10

data/lib/ronin/gen/config.rb

@@ -26,8 +26,9 @@ module Ronin
     #
     module Config
       include DataPaths
+      extend DataPaths::Finders
 
-      register_data_dir File.join(File.dirname(__FILE__),'..','..','..','data')
+      register_data_path File.join(File.dirname(__FILE__),'..','..','..','data')
     end
   end
 end

data/lib/ronin/gen/generators/library.rb

@@ -93,7 +93,7 @@ module Ronin
         #
         def generate
           unless options[:no_git]
-            run "git init #{self.destination_root}"
+            inside { run "git init" }
           end
 
           erb File.join('ronin','gen','library','Gemfile.erb'), 'Gemfile'
@@ -129,8 +129,12 @@ module Ronin
         #
         def bin
           mkdir 'bin'
+
+          bin_script = File.join('bin',"ronin-#{@dir_name}")
+
           erb File.join('ronin','gen','library','bin','ronin-name.erb'),
-              File.join('bin',"ronin-#{@dir_name}")
+              bin_script
+          chmod bin_script, 0755
         end
 
         #
@@ -201,7 +205,10 @@ module Ronin
         #
         def finalize
           unless options[:no_git]
-            system('git','commit','-a','-m','Initial commit.')
+            inside do
+              run('git add .')
+              run('git commit -m "Initial commit."')
+            end
           end
         end
 

data/lib/ronin/gen/generators/repository.rb

@@ -38,6 +38,9 @@ module Ronin
         # The repository lib directory
         LIB_DIR = Ronin::Repository::LIB_DIR
 
+        # The primary script directory
+        SCRIPT_DIR = Ronin::Repository::SCRIPT_DIRS.first
+
         # Default license to use
         DEFAULT_LICENSE = 'CC-by'
 
@@ -92,8 +95,8 @@ module Ronin
           mkdir File.join(LIB_DIR,'ronin')
           touch File.join(LIB_DIR,Ronin::Repository::INIT_FILE)
 
+          mkdir SCRIPT_DIR
           mkdir Ronin::Repository::DATA_DIR
-          mkdir Ronin::Repository::CACHE_DIR
         end
 
         #

data/lib/ronin/gen/generators.rb

@@ -17,7 +17,7 @@
 # along with Ronin Gen.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'open_namespace'
+require 'ronin/auto_load'
 
 module Ronin
   module Gen
@@ -25,7 +25,7 @@ module Ronin
     # {Generators} is the namespace where all generators are loaded from.
     #
     module Generators
-      include OpenNamespace
+      include AutoLoad
     end
   end
 end

data/lib/ronin/gen/version.rb

@@ -20,6 +20,6 @@
 module Ronin
   module Gen
     # Ronin Gen version
-    VERSION = '1.0.0'
+    VERSION = '1.0.1.rc1'
   end
 end

data/spec/gen/generators/repository_spec.rb

@@ -35,15 +35,15 @@ describe Gen::Generators::Repository do
   end
 
   it "should create a lib/ directory" do
-    path.join(Ronin::Repository::LIB_DIR).should be_directory
+    path.join('lib').should be_directory
   end
 
   it "should create a lib/ronin/ directory" do
-    path.join(Ronin::Repository::LIB_DIR,'ronin').should be_directory
+    path.join('lib','ronin').should be_directory
   end
 
-  it "should create a cache/ directory" do
-    path.join(Ronin::Repository::CACHE_DIR).should be_directory
+  it "should create a scripts/ directory" do
+    path.join('scripts').should be_directory
   end
 
   it "should create a Rakefile" do
@@ -51,11 +51,11 @@ describe Gen::Generators::Repository do
   end
 
   it "should create a 'ronin.yml' file" do
-    path.join(Ronin::Repository::METADATA_FILE).should be_file
+    path.join('ronin.yml').should be_file
   end
 
   describe "ronin.yml" do
-    subject { YAML.load_file(path.join(Ronin::Repository::METADATA_FILE)) }
+    subject { YAML.load_file(path.join('ronin.yml')) }
 
     it "should contain a Hash" do
       subject.should be_kind_of(Hash)

data/spec/gen/helpers/data.rb

@@ -4,6 +4,6 @@ module Helpers
   module Gen
     include DataPaths
 
-    register_data_dir File.join(File.dirname(__FILE__),'data')
+    register_data_path File.join(File.dirname(__FILE__),'data')
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ronin-gen
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+  prerelease: 6
+  version: 1.0.1.rc1
 platform: ruby
 authors: 
 - Postmodern
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -04:00
-default_executable: ronin-gen
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open_namespace
@@ -29,12 +28,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.1
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: 0.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -56,7 +52,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: *id004
@@ -67,7 +63,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -169,7 +165,6 @@ files:
 - spec/gen/helpers/data.rb
 - spec/gen/helpers/data/generators/templated.txt.erb
 - spec/spec_helper.rb
-has_rdoc: yard
 homepage: http://github.com/ronin-ruby/ronin-gen
 licenses: 
 - GPL-3
@@ -193,12 +188,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - git >= 1.6.0.0, for the library generator
 rubyforge_project: ronin-gen
-rubygems_version: 1.6.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: A Ruby library for Ronin that provides various generators.
 test_files: 
-- spec/gen/generator_spec.rb
 - spec/gen/gen_spec.rb
 - spec/gen/generators/library_spec.rb
 - spec/gen/generators/repository_spec.rb
+- spec/gen/generator_spec.rb