ruby-app 0.1.6 → 0.1.7

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 _1
 _0
 _2
+TODO

data/README.md

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

data/lib/ruby-app/application.rb

@@ -1,7 +1,9 @@
 # -*- encoding : utf-8 -*-
 
 class Application
+
   class << self
+  
     def tmp_dir
       @tmp_dir ||= File.join(root, %w{tmp})
     end
@@ -11,8 +13,26 @@ class Application
     end
 
     def env
-      @env ||= ENV['APP_ENV'] || ENV['RAILS_ENV'] || 'development'
+      @env ||= begin
+        env = ENV['APP_ENV'] || ENV['RAILS_ENV']
+        
+        # if not specify env, try find file with env config/environment.current
+        # which created this file by a capistrano, by example
+        unless env
+          path = File.join(root, %w{ config environment.current })
+          if File.exists?(path)
+            env = File.read(path)
+            env.strip!
+          end
+        end       
+        
+        env = 'development' unless env
+        
+        env
+      end
     end
+    
+    alias :environment :env
 
     def logger
       @logger ||= begin
@@ -38,7 +58,11 @@ class Application
     def initializer_paths
       @initializer_paths ||= []
     end
+    
+    def bundler_group
+    end
+    
   end
 end
 
-A = App = Application unless defined?(App)
+App = Application unless defined?(App)

data/lib/ruby-app/common_config.rb

@@ -8,6 +8,28 @@ class CommonConfig
     s.instance_eval(&block)
     @@configs.merge!(s.configs)
   end
+
+  def self.load(config_file, shouldbe = false)
+    if File.exists?(config_file)
+      require 'yaml'
+      
+      h = YAML.load_file(config_file)
+      if h.is_a?(Hash)
+        h.symbolize_keys!
+        @@configs.merge!(h)
+      else
+        raise "config should be a Hash, but not #{h.inspect}"
+      end
+    else
+      if shouldbe
+        raise "config file not found, create! #{config_file.inspect}"
+      end
+    end
+  end
+    
+  def self.save(filename)
+    File.open(filename, 'w'){|f| f.write YAML.dump(@@configs) }
+  end
   
   class Scope
     def initialize
@@ -21,10 +43,10 @@ class CommonConfig
     def method_missing(name, *params, &block)
       if name.to_s =~ /_address$/i
         require 'ostruct'
-        @configs[name] = block || OpenStruct.new(:host => params[0], :port => params[1].to_i)
+        @configs[name.to_sym] = block || OpenStruct.new(:host => params[0], :port => params[1].to_i)
       else
         params = params[0] if params.size == 1
-        @configs[name] = block || params
+        @configs[name.to_sym] = block || params
       end
     end
   end
@@ -32,20 +54,19 @@ class CommonConfig
   def self.[]=(option, value)
     @@configs[option.to_sym] = value
   end
-
-  def self.[](option)
-    if @@configs.key?(option)
-      res = @@configs[option]
-      res.is_a?(Proc) ? res.call : res
-    else
-      super
-    end
+  
+  def self.has_key?(key)
+    @@configs.key?(key.to_sym)
+  end
+  
+  def self.try(method)
+    self.send(method) rescue nil
   end
 
-  def self.method_missing(*args)
-    if @@configs.key?(args[0])
-      res = @@configs[args[0]]
-      res.is_a?(Proc) ? res.call : res
+  def self.method_missing(name, *args)
+    if has_key?(name)
+      res = @@configs[name.to_sym]
+      res.is_a?(Proc) ? res.call : res      
     else
       super
     end

data/lib/ruby-app/environment.rb

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-#require 'yaml'
-
 local_root = File.dirname(__FILE__)
 
 # app from gem
@@ -19,8 +17,6 @@ require File.join(local_root, 'default_config')
 # gems from app
 Bundler.require(:default, App.env.to_sym)
 
-GC.start
-
 # AS dependencies
 require 'active_support/dependencies'
 require 'active_support/core_ext/numeric/time'
@@ -29,6 +25,12 @@ require 'active_support/core_ext/object/blank'
 # load application app
 require File.join(App.root, %w{lib application})
 
+# require App.bundler_group if defined
+Bundler.require(App.bundler_group, "#{App.bundler_group}_#{App.env}") if App.bundler_group
+
+# for free usless data from bundler and gems
+GC.start
+
 unless defined?(Rake)
   App.logger.info "Loading #{App.name}[#{App.env}] ..."
 end
@@ -36,6 +38,10 @@ end
 # default config from app
 require File.join(App.root, %w{config config})
 
+# Load configs from yaml
+CommonConfig.load(File.join(App.root, %w{config config.yml}))
+CommonConfig.load(File.join(App.root, ['config', "config.yml.#{App.env}"]))
+
 # configs from app for env
 begin
   require File.join(App.root, %W( config environments #{App.env}))
@@ -55,16 +61,16 @@ dirs.each do |a|
   ActiveSupport::Dependencies::autoload_paths << a
 end
 
-# load initializers app
-Dir["#{App.root}/config/initializers/*.rb"].each{ |x| load(x) }
-
 # load initializers from other gems
 unless App.initializer_paths.empty?
   App.initializer_paths.flatten.each do |path|
     require File.expand_path(path)
   end
 end
-        
+
+# load initializers app
+Dir["#{App.root}/config/initializers/*.rb"].each{ |x| load(x) }
+
 # first load models app
 Dir["#{App.root}/app/models/*.rb"].each{ |x| require x }
 

data/lib/ruby-app/version.rb

@@ -1,3 +1,3 @@
 module RubyApp
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/app_spec.rb

@@ -28,6 +28,15 @@ describe "RubyApp" do
       App.config.proc_test.should == "bbbccc"
     end
     
+    it "load config from file config/config.yml" do
+      App.config.file.should == :yml
+    end
+    
+    it "safe check parameter in config" do
+      App.config.try(:file).should == :yml
+      App.config.try(:file2).should == nil
+    end
+    
     it "should load extensions" do
       App.some_gem_method.should == "some gem method"
     end

data/spec/test_app/config/config.yml

@@ -0,0 +1,2 @@
+file:
+  :yml

metadata

@@ -1,115 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-app
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.1.7
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
 platform: ruby
-authors: 
+authors:
 - Makarchev Konstantin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
-  prerelease: false
+date: 2012-06-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: thor
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-description: Little ruby application template. For creates light ruby apps (daemons, EventMachine-apps, ...). Supports bundler, environments, rails dirs tree.
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  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
@@ -155,6 +160,7 @@ files:
 - spec/test_app/bin/.gitkeep
 - spec/test_app/config/boot.rb
 - spec/test_app/config/config.rb
+- spec/test_app/config/config.yml
 - spec/test_app/config/environment.rb
 - spec/test_app/config/environments/development.rb
 - spec/test_app/config/environments/production.rb
@@ -167,36 +173,32 @@ 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -590066895
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -590066895
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby application template
 test_files: []
-