ruby_storm 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7e6151c5ed4d97e2d7dc22b9b2f2d2878c91d0
-  data.tar.gz: 350cf19b627ea46f0356b3f75add71d455ae0552
+  metadata.gz: 6e4c5622141af3b2783056a9e0d90e5973fbfc07
+  data.tar.gz: 0359c06c3cb32e9e0d28a83dd9324b9530882191
 SHA512:
-  metadata.gz: 483ccedac53f7f5b6648d3c3e1b404f4dc63c38ecd29ac876247a14b77412d8d68056496cc290ea01b4c6dc36162d4f36005c25a5b93eceaa7cbe703b016b65f
-  data.tar.gz: 8c4ead33b151c54b1652e70239cf59cc3b4731adc7edb3fc8149e577ba45ac19976189d0ef5be8c1483611011868978ba7710ff9c912f82f3b246b4f00ca0bad
+  metadata.gz: 6e6db8f8ca6af8c84a6efe7fca1d0e1e11763145987d83339a846749a0443ee762e520ce2559b083733174364fa8d7fbbc420a5c3c99dbe8e933810bc118de5b
+  data.tar.gz: 15f35ed80d0e1512bc79b112160a8d658e0c17d5096900dcda25c239f3237ed300b3bc899a8334109ea3f3476dc81bea51c162efa3d53aaff093ca54c7152c8b

data/application/application.rb

@@ -3,13 +3,13 @@ require 'fileutils'
 require_relative '../generators/version'
 
 module Storm
-  STORM_DIR = File.expand_path("#{File.dirname(__FILE__)}/../")
-  STORM_ENV = ENV['DATABASE_ENV']    || 'development'
-  DB_VERSION =   ENV['DB_VERSION']   || nil
-  DATABASE_DIR = ENV['DATABASE_DIR'] || './db'
-  APP_NAME = ENV['APP_NAME']         || Inflector::classify(File.basename(FileUtils.pwd))
+  STORM_DIR      = File.expand_path("#{File.dirname(__FILE__)}/../")
+  STORM_ENV      = ENV['DATABASE_ENV'] || 'development'
+  DB_VERSION     = ENV['DB_VERSION']   || nil
+  DATABASE_DIR   = ENV['DATABASE_DIR'] || './db'
+  APP_NAME       = ENV['APP_NAME']     || Inflector::classify(File.basename(FileUtils.pwd))
   MIGRATIONS_DIR = "#{DATABASE_DIR}/migrate"
-  APP_DIR = File.expand_path("./")
+  APP_DIR        = File.expand_path("./")
 
   def self.env
     STORM_ENV

data/bin/storm

@@ -3,7 +3,7 @@ require 'thread_safe'
 
 module Storm
 
-  require File.expand_path("./../../application/inflector", __FILE__)
+  require File.expand_path("./../../vendor/inflector", __FILE__)
   require File.expand_path("./../../application/application", __FILE__)
 
   def self.perform!(namespace, args=ARGV)
@@ -30,12 +30,21 @@ module Storm
     return 0
   end
 
+  def self.load_environment
+    require 'thread_safe'
+    require 'active_record'
+    require "awesome_print"
+    require 'bundler'
+    ::Bundler.require(:default, :development)
+    Dir["./**/*.rb"].each{|file| next if /db\/migrate/ =~ file; require file }
+  end
+
   def self.generator(names)
     generators_and_paths = names.map{|name|
       [name.capitalize,name.downcase]
     }
 
-    klass = "::Storm::"+generators_and_paths.map(&:first).join("::")
+    klass = ["","Storm",generators_and_paths.flat_map(&:first)].flatten.join("::")
     path = File.expand_path("./../../generators/#{generators_and_paths.map(&:last).join("/")}.rb", __FILE__)
     if File.exists?(path)
       require path

data/generators/console.rb

@@ -7,20 +7,8 @@ module Storm
     end
 
     def self.start(*args)
-      reload_proc = proc{ Storm::Console.start(*args) }
-
-      require 'thread_safe'
-      require 'active_record'
-      require "awesome_print"
-      require 'bundler'
-
-      ::Bundler.require(:default, :development)
-      Dir["./**/*.rb"].each{|file| next if /db\/migrate/ =~ file; require file }
-
-      require File.expand_path("./../../application/inflector", __FILE__)
-      require File.expand_path("./../../application/application", __FILE__)
-
-      ActiveRecord::Base.establish_connection YAML.load_file('./db/databases.yml')[Storm::STORM_ENV] rescue nil
+      Storm.load_environment
+      ActiveRecord::Base.establish_connection YAML.load_file('./db/database.yml')[Storm::STORM_ENV]
       ARGV.clear
       begin
         require 'pry'
@@ -32,7 +20,6 @@ module Storm
           @@reload = false
           self.start(*args)
         else
-          puts e
           require 'irb'
           ::IRB.start
         end

data/generators/db/create.rb

@@ -7,35 +7,20 @@ module Storm::Db
 
       create_db = lambda do |config|
         # drops and create need to be performed with a connection to the 'postgres' (system) database
-        if config["adapter"] == 'postgres'
-          ::ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-        end
+        ::ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public')) if self.postgres?
         # drop the old database (if it exists)
         ::ActiveRecord::Base.connection.drop_database config["database"] rescue nil
         # create new
-        ::ActiveRecord::Base.connection.create_database(config["database"]) rescue nil
+        ::ActiveRecord::Base.connection.create_database(config["database"])
         ::ActiveRecord::Base.establish_connection(config)
       end
 
       begin
         create_db.call self.config
-      rescue Exception => sqlerr
-        if sqlerr.errno == 1405
-          print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-          root_password = $stdin.gets.strip
-
-          grant_statement = <<-SQL
-            GRANT ALL PRIVILEGES ON #{config['database']}.*
-              TO '#{config['username']}'@'localhost'
-              IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;
-          SQL
-
-          create_db.call config.merge('database' => nil, 'username' => 'root', 'password' => root_password)
-        else
-          $stderr.puts sqlerr.error
-          $stderr.puts "Couldn't create database for #{config.inspect}, charset: utf8, collation: utf8_unicode_ci"
-          $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
-        end
+      rescue Exception => create_exception
+        $stderr.puts create_exception
+        $stderr.puts "Couldn't create database for #{config.inspect}, charset: utf8, collation: utf8_unicode_ci"
+        $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
       end
     end
   end

data/generators/db/db_command.rb

@@ -1,8 +1,13 @@
 class Storm::DBCommand
   require 'active_record'
   require 'yaml'
+
   def self.config
-    @config ||= ::YAML.load_file('./db/databases.yml')[Storm::STORM_ENV]
+    @config ||= ::YAML.load_file('./db/database.yml')[Storm::STORM_ENV]
+  end
+
+  def self.postgres?
+    config["adapter"] == 'postgresql'
   end
 
   def self.connect

data/generators/db/drop.rb

@@ -3,11 +3,14 @@ require_relative "db_command"
 module Storm::Db
   class Drop < Storm::DBCommand
     def self.start(args)
-      ::ActiveRecord::Base.connection.drop_database self.connect['database'] rescue
-      if self.config['adapter'] == 'sqlite3'
+      case self.config['adapter']
+      when 'sqlite3'
         db_file = File.expand_path("./"+self.config['database'])
-        File.delete(db_file)
+        return File.delete(db_file)
+      when 'postgresql'
+        ::ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
       end
+      ::ActiveRecord::Base.connection.drop_database self.config['database'] rescue nil
     end
   end
 end

data/generators/init.rb

@@ -3,10 +3,11 @@ require 'fileutils'
 module Storm
   class Init
     def self.start(args)
-      app_name = args[0]
+      app_name   = args[0]
       class_name = Inflector::classify(app_name)
-      file_name = "#{Inflector::underscore(app_name)}.rb"
-      dir_name = "#{Inflector::underscore(app_name)}"
+      dir_name   = Inflector::underscore(app_name)
+      file_name  = "#{Inflector::underscore(app_name)}.rb"
+
       FileUtils.mkdir_p(dir_name)
       FileUtils.mkdir_p("./#{dir_name}/#{MIGRATIONS_DIR}") rescue nil
       gemfile(dir_name)
@@ -41,10 +42,10 @@ end
     end
 
     #
-    # Write databases.yml
+    # Write database.yml
     #
     def self.dbfile(dir_name)
-      File.open("./#{dir_name}/db/databases.yml", "w+") do |f|
+      File.open("./#{dir_name}/db/database.yml", "w+") do |f|
         f.puts "\
 default: &default
   adapter: sqlite3

data/generators/start.rb

@@ -3,12 +3,7 @@ require 'fileutils'
 module Storm
   class Start
     def self.start(args)
-      require 'thread_safe'
-      require 'active_record'
-      require "awesome_print"
-      require 'bundler'
-      ::Bundler.require(:default, :development)
-      Dir["./**/*.rb"].each{|file| next if /db\/migrate/ =~ file; require file }
+      Storm.load_environment
       project_name = File.basename(Dir.pwd)
       class_name = Inflector::classify(project_name)
       Inflector::constantize(class_name).main(STORM_ENV, ARGV[1..-1])

data/generators/version.rb

@@ -1,7 +1,7 @@
 module Storm
   class Version
     def self.to_s(*args)
-      "0.0.9"
+      "0.0.10"
     end
 
     def self.start(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_storm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -106,7 +106,6 @@ files:
 - Gemfile.lock
 - README.md
 - application/application.rb
-- application/inflector.rb
 - bin/storm
 - generators/app.rb
 - generators/console.rb
@@ -124,6 +123,7 @@ files:
 - generators/version.rb
 - ruby_storm.gemspec
 - rubystorm.todo
+- vendor/inflector.rb
 homepage: http://rubygems.org/gems/ruby_storm
 licenses:
 - MIT