ricque 0.1.2 → 0.1.3

data/lib/ricque/app_generator.rb

@@ -43,14 +43,19 @@ module Ricque
       Dir.chdir(app_path) do
         puts "Copying files"
         FileUtils.cp_r template_path, ".", :preserve => true
+        
         puts "Renaming file content"
-        `grep -Irl "Ricque" . | xargs sed -i '' 's/Ricque/#{camelized_app_name}/g'`
-        `grep -Irl "ricque" . | xargs sed -i '' 's/ricque/#{dashesized_app_name}/g'`
-        `grep -Irl "{RICQUE_VERSION}" . | xargs sed -i '' 's/{RICQUE_VERSION}/#{Ricque::VERSION}/g'`
+        if RUBY_PLATFORM.downcase.include?("darwin")
+           sed_args_platform_specific = "''"
+        else
+           sed_args_platform_specific = "-e"
+        end
+        `grep -Irl "Ricque" . | xargs sed -i #{sed_args_platform_specific} 's/Ricque/#{camelized_app_name}/g'`
+        `grep -Irl "ricque" . | xargs sed -i #{sed_args_platform_specific} 's/ricque/#{dashesized_app_name}/g'`
+        `grep -Irl "{RICQUE_VERSION}" . | xargs sed -i #{sed_args_platform_specific}'s/{RICQUE_VERSION}/#{Ricque::VERSION}/g'`
+
         puts "Renaming files"
-        FileUtils.mv 'lib/ricque', "lib/#{dashesized_app_name}"
-        FileUtils.mv "lib/ricque.rb", "lib/#{dashesized_app_name}.rb"
-        FileUtils.mv "lib/tasks/ricque.rake", "lib/tasks/#{dashesized_app_name}.rake"
+        `find . -name '*ricque*' | sed -e "p;s/ricque/#{dashesized_app_name}/" | xargs -n2 mv`
       end
     end
   end

data/lib/ricque/version.rb

@@ -1,3 +1,3 @@
 module Ricque
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/template/Gemfile

@@ -1,12 +1,10 @@
-source :rubygems
+source "https://rubygems.org"
 
 if RUBY_VERSION =~ /1.9/
   Encoding.default_external = Encoding::UTF_8
   Encoding.default_internal = Encoding::UTF_8
 end
 
-gem 'slogger'
-
 group :test do
   gem 'rspec'
   gem "simplecov"
@@ -14,5 +12,5 @@ group :test do
 end
 
 group :development, :debug do
-  gem 'ruby-debug19', :require => 'ruby-debug'
+  gem 'debugger', :require => 'debugger'
 end

data/lib/template/Gemfile.lock

@@ -1,11 +1,14 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
     columnize (0.3.6)
+    debugger (1.6.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.1.3)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     multi_json (1.5.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -15,30 +18,18 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    slogger (0.0.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  debugger
   rspec
-  ruby-debug19
   simplecov
   simplecov-rcov
-  slogger

data/lib/template/config/application.rb

@@ -1,15 +1,13 @@
 require File.expand_path('../boot', __FILE__)
 
 module Ricque
-  
-  RICQUE_VERSION = '{RICQUE_VERSION}'
 
   @@initialized = false
 
   def self.initialize!
     return if @@initialized
 
-    puts "#{"="*5} Loading Ricque #{"="*40}"
+    puts "#{"="*5} Loading application Ricque #{"="*40}"
     started_at = Time.now
 
     initializer_files_path = ::File.join(::File.expand_path('initializers', self.config_dir), '**', '*.rb')
@@ -18,25 +16,25 @@ module Ricque
     environment            = self.env
 
     if !File.exists?(environment_file_path) 
-      puts "\tEnvironment file was not found for [#{self.env}]"
+      puts "\t* Environment file was not found for [#{self.env}]"
       environment = Ricque::DEFAULT_ENVIRONMENT
       environment_file_path = ::File.join(::File.expand_path('environments', self.config_dir), "#{Ricque::DEFAULT_ENVIRONMENT}.rb")
     end
 
-    puts "\tExecuting before_initialize_blocks (#{before_initialize_blocks.count})"
-    execute_before_initialize!
+    load_path environment_file_path, "\t* Loading environment file for [#{environment}]"
 
-    load_path environment_file_path, "\tLoading environment file for [#{environment}]"
+    puts "\t* Executing before_initialize_blocks (#{before_initialize_blocks.count})"
+    execute_before_initialize!
 
-    load_path initializer_files_path, "\tLoading initializers"
+    load_path initializer_files_path, "\t* Loading initializers"
 
-    load_path lib_files_path, "\tLoading application files"
+    load_path lib_files_path, "\t* Loading application files"
 
-    puts "\tExecuting after_initialize_blocks (#{after_initialize_blocks.count})"
+    puts "\t* Executing after_initialize_blocks (#{after_initialize_blocks.count})"
     execute_after_initialize!
 
-    puts "\tRicque loaded on environment \"#{ENV["RUBY_ENV"]}\" in #{Time.now - started_at} seconds"
-    puts "#{"="*5} Ricque loaded #{"="*40}"
+    puts "\t* Ricque loaded on environment \"#{ENV["RUBY_ENV"]}\" in #{Time.now - started_at} seconds"
+    puts "#{"="*5} Application Ricque loaded #{"="*40}"
 
     @@initialized = true
 
@@ -67,27 +65,6 @@ module Ricque
     block.call configuration
   end
 
-  def self.configuration
-    @@config ||= {}
-    @@config
-  end
-
-  def self.logger= logger
-    configuration[:logger] = logger
-  end
-
-  def self.logger
-    configuration[:logger]
-  end
-
-  def self.logger?
-    !configuration[:logger].nil?
-  end
-
-  def self.development?
-    ENV["RUBY_ENV"] == "development"
-  end
-
   def self.load_tasks
     tasks_files = ::File.join(::File.expand_path('lib/tasks', self.root), '**', '*.rake')
 
@@ -109,6 +86,6 @@ module Ricque
   def self.load_path path, message
     files = ::Dir[path]
     puts "#{message} (#{files.size})"
-    files.each { |file| load file }
+    files.sort.each { |file| require file }
   end
 end

data/lib/template/config/boot.rb

@@ -1,25 +1,31 @@
+require 'logger'
+
 module Ricque
-  APP_NAME = 'ricque'
+  APP_NAME            = 'ricque'
   DEFAULT_ENVIRONMENT = 'development'
+  APP_ROOT            = ::File.expand_path('../..', __FILE__)
+  CONFIG_ROOT         = ::File.expand_path('config', APP_ROOT)
+  LIB_DIR             = ::File.expand_path("lib/#{APP_NAME}", APP_ROOT)
+  RICQUE_VERSION      = '{RICQUE_VERSION}'
 
   def self.app_name
     APP_NAME
   end
 
   def self.lib_dir
-    ENV["LIB_DIR_#{app_name}"]
+    LIB_DIR
   end
 
   def self.config_dir
-    ENV["CONFIG_ROOT_#{app_name}"]
+    CONFIG_ROOT
   end
 
   def self.config_dir= config_dir
-    ENV["CONFIG_ROOT_#{app_name}"] = config_dir
+    CONFIG_ROOT
   end
   
   def self.root
-    ENV["APP_ROOT_#{app_name}"]
+    APP_ROOT
   end
 
   def self.env
@@ -29,16 +35,31 @@ module Ricque
   def self.groups
     ENV["BUNDLER_GROUPS"].split(',')
   end
-end
 
-ENV["APP_ROOT_#{Ricque.app_name}"]    = ::File.expand_path('../..', __FILE__)
-ENV["CONFIG_ROOT_#{Ricque.app_name}"] = ::File.expand_path('config', ENV["APP_ROOT_#{Ricque.app_name}"])
-ENV["LIB_DIR_#{Ricque.app_name}"]     = ::File.expand_path("lib/#{Ricque.app_name}", ENV["APP_ROOT_#{Ricque.app_name}"])
+  def self.configuration
+    @@config ||= {}
+    @@config
+  end
+
+  def self.logger= logger
+    configuration[:logger] = logger
+  end
 
-Ricque::DEFAULT_ENVIRONMENT = "development" unless defined?(Ricque::DEFAULT_ENVIRONMENT)
+  def self.logger
+    configuration[:logger] ||= Logger.new(STDOUT)
+  end
+
+  def self.logger?
+    !configuration[:logger].nil?
+  end
+
+  def self.development?
+    ENV["RUBY_ENV"] == "development"
+  end
+end
 
-ENV["RUBY_ENV"]     = ENV["RUBY_ENV"] || ENV["RACK_ENV"] || Ricque::DEFAULT_ENVIRONMENT
-ENV["RACK_ENV"]     = ENV["RUBY_ENV"]
+ENV["RUBY_ENV"] = ENV["RUBY_ENV"] || ENV["RACK_ENV"] || Ricque::DEFAULT_ENVIRONMENT
+ENV["RACK_ENV"] = ENV["RUBY_ENV"]
 
 ENV["BUNDLER_GROUPS"] = "default,#{ENV["RUBY_ENV"]}"
 

data/lib/template/config/initializers/00_logger.rb

@@ -0,0 +1 @@
+Ricque.logger = Logger.new(STDOUT) if Ricque.logger.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ricque
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70213412739500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 3.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70213412739500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.9
 description: Ricque is a generator of Ruby applications with bootstrap similar to
   Rails' bootstrap
 email:
@@ -31,32 +36,29 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ricque/app_generator.rb
-- lib/ricque/version.rb
 - lib/ricque.rb
+- lib/template/README
 - lib/template/.gitignore
+- lib/template/script/console
+- lib/template/Gemfile.lock
+- lib/template/doc/README_FOR_APP
+- lib/template/spec/spec_helper.rb
+- lib/template/lib/ricque.rb
+- lib/template/lib/ricque/version.rb
+- lib/template/lib/tasks/ricque.rake
+- lib/template/lib/tasks/rspec.rake
 - lib/template/.rspec
-- lib/template/.rvmrc
-- lib/template/config/application.rb
 - lib/template/config/boot.rb
-- lib/template/config/environment.rb
 - lib/template/config/environments/development.rb
 - lib/template/config/environments/production.rb
 - lib/template/config/environments/test.rb
-- lib/template/config/initializers/00_slogger.rb
-- lib/template/doc/README_FOR_APP
+- lib/template/config/initializers/00_logger.rb
+- lib/template/config/application.rb
+- lib/template/config/environment.rb
 - lib/template/Gemfile
-- lib/template/Gemfile.lock
-- lib/template/lib/ricque/version.rb
-- lib/template/lib/ricque.rb
-- lib/template/lib/tasks/ricque.rake
-- lib/template/lib/tasks/rspec.rake
-- lib/template/log/.gitkeep
 - lib/template/Rakefile
-- lib/template/README
-- lib/template/script/console
-- lib/template/spec/spec_helper.rb
-- lib/template/tmp/pids/.gitkeep
+- lib/ricque/version.rb
+- lib/ricque/app_generator.rb
 - bin/ricque
 homepage: 
 licenses:
@@ -79,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ricque
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ricque is a generator of Ruby applications with bootstrap similar to Rails'

data/lib/template/.rvmrc

@@ -1 +0,0 @@
-rvm --create 1.9.2@ricque

data/lib/template/config/initializers/00_slogger.rb

@@ -1,3 +0,0 @@
-require 'slogger'
-
-Ricque.logger = Slogger::CommonLogger.new(Ricque.app_name, Ricque.configuration[:log_level], :local7) if Ricque.logger.nil?