shogun 6.2.3 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbbb7d3dded3ef408c23d684b28cef3066ef0dba
-  data.tar.gz: 11966bcc7dfa5ee5293136d19483409371e60027
+  metadata.gz: 1938926835f430d9fe1e672f29ba8849ff3c9622
+  data.tar.gz: 49678abf7ce6a50214e30dd59861f2e762e9efc8
 SHA512:
-  metadata.gz: 4e8db39ec518c88b89dd4982da3ac3590cd532ae35a2ebe40d5fc9caabf7227494b6962b222d1f41e5626f7b32a325940fd8a9eb2f3a0da198b8320af824c899
-  data.tar.gz: bc396c2fd4ef36836692f9163c4dddbe8cd1fdd8fcbb2a0c2838cb9c2a67ef542c8b2d1b60cf836a011a6f46d4fd3f985843c12f91b0607c9fa7fc35dd8f9d50
+  metadata.gz: 77824cb9d90de73e0e0b9cecf8bfce6161f77ff0c28eaa54ebbdf109e04dfc1a689b6d4c7a7a8ad7cb503ebf01ccdd0270eb747d0d63dad12ae8a60d99eb5271
+  data.tar.gz: 06785b2ecfbd19ac5772d45dd4780d32378ecf1415c44b301f5bb5b56f384156a75857558c2d930eb5a728ba28523415dc22f9a748a6adc4194747b37b5241ee

data/lib/shogun/command.rb

@@ -6,6 +6,7 @@ module Shogun
   class Command
     require_relative "command/new"
     require_relative "command/generate"
+    require_relative "command/database"
 
     def initialize(namespace, command, *parameters)
       @namespace = namespace
@@ -16,20 +17,14 @@ module Shogun
     def execute
       case @command
       when "new" then
-        ::Shogun::Command::New.new(@namespace, *@parameters).execute
+        ::Shogun::Command::New.new(@namespace, *@parameters)
       when "generate" then
-        ::Shogun::Command::Generate.new(@namespace, *@parameters).execute
+        ::Shogun::Command::Generate.new(@namespace, *@parameters)
       when "database" then
-        case ARGV.shift
-        when "reset" then
-          ::Shogun::Database.setup!(logger: Logger.new(STDOUT))
-        when "console" then
-          ::Shogun::Database.new(logger: Logger.new(STDOUT))
-          binding.pry
-        end
+        ::Shogun::Command::Database.new(@namespace, *@parameters)
       when "console" then
         binding.pry
-      end
+      end.execute
     end
   end
 end

data/lib/shogun/command/database.rb

@@ -0,0 +1,21 @@
+module Shogun
+  class Command
+    class Database
+      def initialize(namespace, command, *parameters)
+        @namespace = namespace
+        @command = command
+        @parameters = parameters
+      end
+
+      def execute
+        case @command
+          when "reset" then
+            ::Shogun::Database.setup!(logger: Logger.new(STDOUT))
+          when "console" then
+            ::Shogun::Database.new(logger: Logger.new(STDOUT))
+            binding.pry
+        end
+      end
+    end
+  end
+end

data/lib/shogun/command/generate.rb

@@ -40,7 +40,7 @@ module Shogun
       end
 
       private def scaffold_directory
-        File.join(gem_directory, "scaffold", "resource")
+        File.join(gem_directory, "scaffold", "generate")
       end
 
       private def namespace_directory

data/lib/shogun/database.rb

@@ -33,11 +33,11 @@ module Shogun
 
     def initialize(logger:)
       @logger = logger
-      ActiveRecord::LogSubscriber.logger = @logger
-      ActiveRecord::LogSubscriber.colorize_logging = false
       ActiveRecord::Base.time_zone_aware_attributes = true
       ActiveRecord::Base.default_timezone = (timezone || default_timezone).to_sym
       ActiveRecord::Base.logger = @logger
+      ActiveRecord::LogSubscriber.logger = @logger
+      ActiveRecord::LogSubscriber.colorize_logging = false
       ActiveRecord::Base.establish_connection(uri)
     end
 

data/lib/shogun/version.rb

@@ -1,3 +1,3 @@
 module Shogun
-  VERSION = "6.2.3"
+  VERSION = "6.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shogun
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.3.0
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -330,6 +330,7 @@ files:
 - lib/shogun.rb
 - lib/shogun/authorizer.rb
 - lib/shogun/command.rb
+- lib/shogun/command/database.rb
 - lib/shogun/command/generate.rb
 - lib/shogun/command/new.rb
 - lib/shogun/control.rb