ruby-app 0.1.1 → 0.1.2

data/.gitignore

@@ -1,3 +1,4 @@
 Gemfile.lock
 *.gem
 _1
+_0

data/README.md

@@ -1,7 +1,8 @@
 RubyApp
 =======
 
-Little ruby application template. For light ruby apps (daemons, EventMachine-apps, ...)
+Little ruby application template. For creates light ruby apps (daemons, EventMachine-apps, ...). 
+Supports bundler, environments, rails dirs tree.
 
 ```ruby
 gem install ruby-app

data/bin/ruby-app

@@ -10,12 +10,7 @@ class RubyAppGenerator < Thor::Group
   argument :name
  
   def copy_tree
-    Dir["#{source_root}/**/.git*"].each{|f| cp_file f }
-    Dir["#{source_root}/**/*"].each{|f| cp_file f }
-  end
-  
-  def template_app
-    template("#{source_root}/lib/application.rb", "#{name}/lib/application.rb", true)
+    directory('./', "#{name}/")
   end
   
   def chmod_example_bin
@@ -23,22 +18,15 @@ class RubyAppGenerator < Thor::Group
   end
   
 private
-  def cp_file(filename)
-    if File.exists?(filename) && !File.directory?(filename)
-      return if File.basename(filename) == 'application.rb'
-      to = "#{name}#{filename.sub(source_root, '')}"
-      copy_file(filename, to)
-    end                                        
-  end
 
-  def source_root
-    File.join(File.dirname(__FILE__), %w{.. generator})
-  end            
-  
   def self.source_root
     File.join(File.dirname(__FILE__), %w{.. generator})
   end
   
+  def base_name 
+    File.basename(name)
+  end
+  
 end
 
 RubyAppGenerator.start

data/generator/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
+require File.join(File.dirname(__FILE__), %w{config boot})
 
-load "ruby-app/tasks.rb"
+load "ruby-app/tasks.rake"

data/generator/bin/dummy

@@ -2,6 +2,6 @@
 
 require File.join(File.dirname(__FILE__), %w{.. config environment})
 
-App.logger.info "root - #{App.root}"
-App.logger.info "env - #{App.env}"
-App.logger.info "name - #{App.name}"
+App.logger.info "root: '#{App.root}'"
+App.logger.info "env:  '#{App.env}'"
+App.logger.info "name: '#{App.name}'"

data/generator/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'bundler/setup'
+
+class Application
+  def self.root
+    File.join(File.dirname(__FILE__), %w(..))
+  end
+end
+
+require 'ruby-app/boot'

data/generator/config/environment.rb

@@ -1,13 +1,6 @@
 # -*- encoding : utf-8 -*-
-require 'rubygems'
-require 'bundler/setup'
+require File.join(File.dirname(__FILE__), 'boot')
 
-# ENV['APP_ENV'] = 'production' # uncomment if want forced env
-
-class Application
-  def self.root
-    File.join(File.dirname(__FILE__), %w(..))
-  end
-end
+# ENV['APP_ENV'] = 'production' # uncomment if need forced env
 
 require 'ruby-app/environment'

data/generator/lib/{application.rb → application.rb.tt}

@@ -4,7 +4,7 @@ class Application
   class << self
   
     def name
-      "<%= name %>"
+      "<%= base_name %>"
     end
   end
 

data/generator/spec/{spec1_spec.rb → spec1_spec.rb.tt}

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "spec1" do
 
   it "app name should be" do
-    App.name.should be_an_instance_of(String)    
+    App.name.should == "<%= base_name %>"
   end
 
 end

data/lib/ruby-app/application.rb

@@ -29,4 +29,4 @@ class Application
   end
 end
 
-A = App = Application
+A = App = Application unless defined?(App)

data/lib/ruby-app/boot.rb

@@ -0,0 +1,6 @@
+$KCODE='u' if RUBY_VERSION < '1.9'
+
+# app from gem
+require File.join(File.dirname(__FILE__), 'application')
+
+$:.unshift(File.join(App.root, %w{ lib }))

data/lib/ruby-app/environment.rb

@@ -1,13 +1,11 @@
 # -*- encoding : utf-8 -*-
 
-$KCODE='u' if RUBY_VERSION < '1.9'
-
 #require 'yaml'
 
 local_root = File.dirname(__FILE__)
 
 # app from gem
-require File.join(local_root, 'application')
+require File.join(local_root, 'boot')
 
 # config from gem
 require File.join(local_root, 'common_config')
@@ -31,7 +29,9 @@ require 'active_support/core_ext/object/blank'
 # load application app
 require File.join(App.root, %w{lib application})
 
-App.logger.info "Loading #{App.name}[#{App.env}] ..."
+unless defined?(Rake)
+  App.logger.info "Loading #{App.name}[#{App.env}] ..."
+end
 
 # default config from app
 require File.join(App.root, %w{config config})
@@ -44,7 +44,7 @@ rescue LoadError
 end
 
 # unshift lib app
-$:.unshift(File.join(App.root, 'lib'))
+# $:.unshift(File.join(App.root, 'lib'))
 
 ActiveSupport::Dependencies::autoload_paths << File.join(App.root, 'lib')
 

data/lib/ruby-app/{tasks.rb → tasks.rake}

@@ -1,14 +1,16 @@
 
-# load gem rakes
+task :environment do
+  require File.join(App.root, %w{config environment})
+end
 
+# load gem rakes
 Dir["#{File.dirname(__FILE__)}/tasks/*.{rb,rake}"].each do |f|
   load f
 end
 
-
 # load app rakes
 if defined?(App)
   Dir["#{App.root}/lib/rake_tasks/*.{rb,rake}"].each do |f|
     load f
   end    
-end
+end

data/lib/ruby-app/version.rb

@@ -1,3 +1,3 @@
 module RubyApp
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/ruby-app.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
 
   s.authors = ["Makarchev Konstantin"]
   
-  s.description = %q{Little ruby application template. For light ruby apps (daemons, EM-apps, ...)}
+  s.description = %q{Little ruby application template. For creates light ruby apps (daemons, EventMachine-apps, ...). Supports bundler, environments, rails dirs tree.}
   s.summary = %q{Ruby application template}
 
   s.email = %q{kostya27@gmail.com}

data/spec/test_app/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'bundler/setup'
+
+class Application
+  def self.root
+    File.join(File.dirname(__FILE__), %w(..))
+  end
+end
+
+require 'ruby-app/boot'

data/spec/test_app/config/environment.rb

@@ -1,14 +1,8 @@
 # -*- encoding : utf-8 -*-
-require 'rubygems'
+require File.join(File.dirname(__FILE__), %w{ boot })
 
 ENV['APP_ENV'] = 'test3'
 
-class Application
-  def self.root
-    File.join(File.dirname(__FILE__), %w(..))
-  end
-end
-
 $:.unshift(File.join(File.dirname(__FILE__), %w{.. .. .. lib}))
 require 'ruby-app/environment'
 

metadata

@@ -1,115 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-app
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Makarchev Konstantin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: Little ruby application template. For light ruby apps (daemons, EM-apps, ...)
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Little ruby application template. For creates light ruby apps (daemons,
+  EventMachine-apps, ...). Supports bundler, environments, rails dirs tree.
 email: kostya27@gmail.com
-executables: 
+executables:
 - ruby-app
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -121,22 +126,24 @@ files:
 - generator/Rakefile
 - generator/app/models/.gitkeep
 - generator/bin/dummy
+- generator/config/boot.rb
 - generator/config/config.rb
 - generator/config/environment.rb
 - generator/config/environments/development.rb
 - generator/config/environments/production.rb
 - generator/config/environments/test.rb
 - generator/config/initializers/.gitkeep
-- generator/lib/application.rb
+- generator/lib/application.rb.tt
 - generator/lib/rake_tasks/.gitkeep
-- generator/spec/spec1_spec.rb
+- generator/spec/spec1_spec.rb.tt
 - generator/spec/spec_helper.rb
 - lib/ruby-app/application.rb
+- lib/ruby-app/boot.rb
 - lib/ruby-app/common_config.rb
 - lib/ruby-app/default_config.rb
 - lib/ruby-app/environment.rb
 - lib/ruby-app/local_logger.rb
-- lib/ruby-app/tasks.rb
+- lib/ruby-app/tasks.rake
 - lib/ruby-app/tasks/rspec.rake
 - lib/ruby-app/version.rb
 - ruby-app.gemspec
@@ -147,6 +154,7 @@ files:
 - spec/test_app/app/models/2.rb
 - spec/test_app/app/models/3.rb
 - spec/test_app/bin/.gitkeep
+- spec/test_app/config/boot.rb
 - spec/test_app/config/config.rb
 - spec/test_app/config/environment.rb
 - spec/test_app/config/environments/development.rb
@@ -160,36 +168,26 @@ files:
 - spec/test_app/lib/application.rb
 homepage: http://github.com/kostya/ruby-app
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby application template
 test_files: []
-