ruby-app 0.1.3 → 0.1.4

data/README.md

@@ -12,6 +12,6 @@ Supports bundler, environments, rails dirs tree.
     
 Run like:
 
-    $ ./bin/dummy
-    $ APP_ENV=production ./bin/dummy
+    $ ./bin/example
+    $ APP_ENV=production ./bin/example
     

data/bin/ruby-app

@@ -16,7 +16,8 @@ class RubyAppGenerator < Thor::Group
   end
   
   def chmod_example_bin
-    chmod "#{name}/bin/dummy", 0755
+    chmod "#{name}/bin/example", 0755
+    chmod "#{name}/bin/console", 0755
   end
   
 private

data/generator/Gemfile

@@ -1,7 +1,8 @@
 source :rubygems
 
+gem 'rake',     :require => false
 gem 'ruby-app'
-gem 'rake', :require => false
+
 
 
 

data/generator/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require File.join(File.dirname(__FILE__), %w{.. config environment})
+
+require 'irb'
+require 'irb/completion'
+
+IRB.start

data/generator/config/boot.rb

@@ -6,7 +6,7 @@ require 'bundler/setup'
 class Application
   class << self
     def root
-      @root ||= File.join(File.dirname(__FILE__), %w(..))
+      @root ||= File.expand_path('../..', __FILE__)
     end
   end
 end

data/lib/ruby-app/application.rb

@@ -26,6 +26,18 @@ class Application
     def config
       CommonConfig
     end
+    
+    def identifier
+      "ruby-app"
+    end
+    
+    def rake_paths
+      @rake_paths ||= []
+    end
+    
+    def initializer_paths
+      @initializer_paths ||= []
+    end
   end
 end
 

data/lib/ruby-app/common_config.rb

@@ -19,14 +19,12 @@ class CommonConfig
   private
   
     def method_missing(name, *params, &block)
-      params = block.call if block
-      
       if name.to_s =~ /_address$/i
         require 'ostruct'
-        @configs[name] = OpenStruct.new(:host => params[0], :port => params[1].to_i)
+        @configs[name] = block || OpenStruct.new(:host => params[0], :port => params[1].to_i)
       else
         params = params[0] if params.size == 1
-        @configs[name] = params
+        @configs[name] = block || params
       end
     end
   end
@@ -37,7 +35,8 @@ class CommonConfig
 
   def self.[](option)
     if @@configs.key?(option)
-      @@configs[option]
+      res = @@configs[option]
+      res.is_a?(Proc) ? res.call : res
     else
       super
     end
@@ -45,7 +44,8 @@ class CommonConfig
 
   def self.method_missing(*args)
     if @@configs.key?(args[0])
-      @@configs[args[0]]
+      res = @@configs[args[0]]
+      res.is_a?(Proc) ? res.call : res
     else
       super
     end

data/lib/ruby-app/environment.rb

@@ -36,6 +36,13 @@ end
 # default config from app
 require File.join(App.root, %w{config config})
 
+# load initializers from other gems
+unless App.initializer_paths.empty?
+  App.initializer_paths.flatten.each do |path|
+    require File.expand_path(path)
+  end
+end
+
 # configs from app for env
 begin
   require File.join(App.root, %W( config environments #{App.env}))

data/lib/ruby-app/tasks.rake

@@ -1,6 +1,6 @@
 
 task :environment do
-  require File.join(App.root, %w{config environment})
+  require File.join(App.root, %w{ config environment })
 end
 
 # load gem rakes
@@ -8,6 +8,13 @@ Dir["#{File.dirname(__FILE__)}/tasks/*.{rb,rake}"].each do |f|
   load f
 end
 
+# load other gems rakes
+if defined?(App) && !App.rake_paths.empty?
+  App.rake_paths.each do |path|
+    load File.expand_path(path)
+  end  
+end
+
 # load app rakes
 if defined?(App)
   Dir["#{App.root}/lib/rake_tasks/*.{rb,rake}"].each do |f|

data/lib/ruby-app/version.rb

@@ -1,3 +1,3 @@
 module RubyApp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/app_spec.rb

@@ -24,6 +24,14 @@ describe "RubyApp" do
       App::BLA.should == 1
     end
     
+    it "proc in config" do
+      App.config.proc_test.should == "bbbccc"
+    end
+    
+    it "should load extensions" do
+      App.some_gem_method.should == "some gem method"
+    end
+    
     it "force set env" do
       App.env.should == 'test3'
       App.config.apps.size.should == 4

data/spec/gem_app/gem.rb

@@ -0,0 +1,6 @@
+
+class Application
+  def self.some_gem_method
+    "some gem method"
+  end
+end

data/spec/test_app/config/environment.rb

@@ -4,6 +4,10 @@ require File.join(File.dirname(__FILE__), %w{ boot })
 ENV['APP_ENV'] = 'test3'
 
 $:.unshift(File.join(File.dirname(__FILE__), %w{.. .. .. lib}))
+
+# gem extension
+App.initializer_paths << File.join(File.dirname(__FILE__), %w{.. .. gem_app gem})
+
 require 'ruby-app/environment'
 
 App.config.test_thing << 3

data/spec/test_app/config/environments/test3.rb

@@ -5,5 +5,9 @@ App.config.define :test3 do
   some2 "bbb"
   
   bla 12
+  
+  proc_test do
+    App.config.some2 + "ccc"
+  end
 
 end

metadata

@@ -1,120 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ruby-app
-version: !ruby/object:Gem::Version
-  version: 0.1.3
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
-authors:
+authors: 
 - Makarchev Konstantin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
-  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
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !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.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+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
@@ -125,7 +120,8 @@ files:
 - generator/Gemfile
 - generator/Rakefile
 - generator/app/models/.gitkeep
-- generator/bin/dummy
+- generator/bin/console
+- generator/bin/example
 - generator/config/boot.rb
 - generator/config/config.rb
 - generator/config/environment.rb
@@ -148,6 +144,7 @@ files:
 - lib/ruby-app/version.rb
 - ruby-app.gemspec
 - spec/app_spec.rb
+- spec/gem_app/gem.rb
 - spec/spec_helper.rb
 - spec/test_app/.gitignore
 - spec/test_app/app/models/.gitkeep
@@ -168,26 +165,36 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby application template
 test_files: []
+