adjective-rpg 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d23d1564000544031c02aa133ff7c70e84d19de797006f12d5f3b8c8bb9b4a6e
-  data.tar.gz: 578435313a63965b6e6db15247cce9d54cc0d93ec8650925cbdf8a35856ea7f0
+  metadata.gz: 9852ba0f7c69f228cab554b4e205dc690aad38b0607d8db388e05d66788162c9
+  data.tar.gz: 0e027b23a3af26fafaccd1741177a5a4aa0aae925087da745924da59858cf219
 SHA512:
-  metadata.gz: 75839d47ad7c1ebffcc52f0b374fd3ceb32be9bcecb9f25139daa38aff5fbb0ff470b7d9a7b2153799f55b18441a0bb1a461fe83811b836d054cfe04a76ebdc6
-  data.tar.gz: a15af2cb9239ca9539309e791bbf4f72e226afba5c856f8ec1b3d9facd4c4dbf6ad6eb4c63a894357dd521d77a98bdd804c10daefd4a568767e614b3c21c3b4b
+  metadata.gz: 74a2d302a689ac9702726bed6b9397fb968d6178d41c170e1ac48c792a80bb74a9fbdc3e4db8251c99111685cc82504d08b2b1f309951a3983a3df84dd1a668f
+  data.tar.gz: bffa9393b756cd7571d44fef8f89c6ee6f013b2e84b04197bef069b594dcce57131a56f1bdcfb1098db92868e3e6a0b3846f9a23aaca6361e39accb956eeeb27

data/Rakefile

@@ -26,41 +26,3 @@ namespace :build do
     # system("gem install adjective-0.1.0.gem")
   end
 end
-
-namespace :adjective do 
-  task :install do 
-    # plain_dummy install command:
-    # rake adjective:install -- config_path=spec/plain_dummy/ thorfile_path=spec/plain_dummy/
-
-    # dummy install command:
-    # rake adjective:install -- config_path=spec/dummy/config/initializers thorfile_path=spec/dummy/
-
-    config_install_path = ARGV.find { |arg| arg.include?("config_path=") }&.split("=")&.last || "config/initializers"
-    thorfile_install_path = ARGV.find { |arg| arg.include?("thorfile_path=") }&.split("=")&.last || Dir.pwd
-
-    loaded_feature = $LOADED_FEATURES.find { |feature| feature.include?('adjective') }
-    adj_thorfile_location = File.join(File.dirname(loaded_feature), 'templates/static/Thorfile')
-    adj_config_location = File.join(File.dirname(loaded_feature), 'templates/static/adjective.rb')    
-
-    begin
-      if !File.directory?(thorfile_install_path)
-        raise Errno::ENOENT, "Thorfile install dir not found: #{thorfile_install_path}. Please ensure that this directory exists." 
-      end
-      FileUtils.cp(adj_thorfile_location, thorfile_install_path)
-      puts "\e[32mInstalled the Adjective Thorfile to: #{File.join(thorfile_install_path, "Thorfile")}\e[0m"
-    rescue => e
-      puts "\e[31mError occured while copying the Adjective Thorfile: #{e.message}\e[0m"
-    end    
-
-    begin
-      if !File.directory?(config_install_path)
-        raise Errno::ENOENT, "Adjective config install dir not found: #{config_install_path}. Please ensure that this directory exists." 
-      end
-      FileUtils.cp(adj_config_location, config_install_path)
-      puts "\e[32mInstalled the Adjective configs to: #{File.join(config_install_path, "adjective.rb")}\e[0m"
-    rescue => e
-      puts "\e[31mError occured while copying the Adjective Thorfile: #{e.message}\e[0m"
-    end   
-
-  end
-end

data/Thorfile

@@ -1,5 +1,5 @@
-require_relative "lib/adjective"
-loaded_feature = $LOADED_FEATURES.find { |feature| feature.include?('lib/adjective') }
+require "adjective"
+loaded_feature = $LOADED_FEATURES.find { |feature| feature.include?('adjective') }
 lib_dir = File.dirname(loaded_feature)
 
 Dir[File.join(lib_dir, 'tasks', '**', '*.thor')].each do |thor_file|

data/lib/tasks/migrate.thor

@@ -1,4 +1,14 @@
 require 'thor'
+require 'awesome_print'
+# gem_lib_path = File.expand_path('../../lib', __dir__)
+# require "#{gem_lib_path}/adjective"
+# require "adjective"
+
+# require_relative "../adjective"
+# Adjective.configure do |config|
+#   ap config
+# end
+
 
 # These are assumed to be run from the project root dir.
 
@@ -11,15 +21,18 @@ require 'thor'
 # thor adjective:generate:columns_for Enemy --includes Vulnerable --config spec/dummy/config/initializers/adjective --rails_load_path ../../spec/dummy/config/environment
 
 # TODO:
+
 # Need to set a deault path for adjective loading from a Rails project.
+
 # Clean shit up. Lots of duplication here. 
-# Might need to change the app conventions around to consider Rails a default.
+
+# Might need to change the app conventions around to consider Rails
 
 module Adjective
   class AdjectiveTasks < Thor
     include Thor::Actions
 
-    default_rails_load_path = './config/environment'
+    default_rails_load_path = 'config/environment'
 
     package_name "adjective"
     namespace 'adjective:generate'
@@ -40,7 +53,7 @@ module Adjective
 
       config_file_path = ENV['ADJECTIVE_CONFIG_PATH'] ||= options[:config]
       adj_configs = File.join( Dir.pwd, config_file_path)
-      rails_load_path = options[:rails_load_path] ||= default_rails_load_path
+      rails_load_path = options[:rails_load_path] || default_rails_load_path
 
       require adj_configs
       if Adjective.configuration.use_rails
@@ -67,9 +80,10 @@ module Adjective
     method_options :config => :string
     method_options :rails_load_path => :string
     def scaffold_for(model)
+      default_rails_load_path = './config/environment'
       config_file_path = ENV['ADJECTIVE_CONFIG_PATH'] ||= options[:config]
       adj_configs = File.join( Dir.pwd, config_file_path)
-      rails_load_path = options[:rails_load_path] ||= default_rails_load_path
+      rails_load_path = options[:rails_load_path] || default_rails_load_path
 
       require adj_configs
 

data/lib/tasks/setup.thor

@@ -0,0 +1,44 @@
+module Adjective
+  class AdjectiveSetup < Thor
+    # thor adjective:setup --config_path spec/file_dummy/config/initializers
+    
+    include Thor::Actions
+    require "fileutils"
+
+    package_name "adjective"
+    namespace 'adjective'
+
+    desc "setup", "Creates the needed files for Adjective"
+    method_options :config_path => :string
+    method_options :thorfile_path => :string
+    def setup
+      config_install_path = options[:config_path] || "config/initializers"
+      thorfile_install_path = options[:thorfile_path] || Dir.pwd
+      template_path = File.expand_path('../templates/static/adjective.rb', __dir__) 
+
+      loaded_feature = $LOADED_FEATURES.find { |feature| feature.include?('adjective') }
+      adj_thorfile_location = File.join(File.dirname(loaded_feature), 'templates/static/Thorfile')
+      adj_config_location = File.join(File.dirname(loaded_feature), 'templates/static/adjective.rb')        
+
+      begin
+        if !File.directory?(config_install_path)
+          raise Errno::ENOENT, "Adjective config install dir not found: #{config_install_path}. Please ensure that this directory exists." 
+        end
+        FileUtils.cp(template_path, config_install_path)
+        puts "\e[32mInstalled the Adjective configs to: #{File.join(config_install_path, "adjective.rb")}\e[0m"
+      rescue => e
+        puts "\e[31mError occured while copying the Adjective config: #{e.message}\e[0m"
+      end 
+
+      begin
+        if !File.directory?(thorfile_install_path)
+          raise Errno::ENOENT, "Thorfile install dir not found: #{thorfile_install_path}. Please ensure that this directory exists." 
+        end
+        FileUtils.cp(adj_thorfile_location, thorfile_install_path)
+        puts "\e[32mInstalled the Adjective Thorfile to: #{File.join(thorfile_install_path, "Thorfile")}\e[0m"
+      rescue => e
+        puts "\e[31mError occured while copying the Adjective Thorfile: #{e.message}\e[0m"
+      end 
+    end
+  end
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Adjective
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adjective-rpg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kevin Maze
@@ -186,7 +186,7 @@ files:
 - lib/modules/vulnerable.rb
 - lib/railties.rb
 - lib/tasks/migrate.thor
-- lib/tasks/migrate_adjective.rake
+- lib/tasks/setup.thor
 - lib/templates/add_columns_migration.rb
 - lib/templates/all_tables.rb
 - lib/templates/create_adjective_class.rb

data/lib/tasks/migrate_adjective.rake

@@ -1,43 +0,0 @@
-require 'adjective'
-
-namespace :adjective do
-
-  desc 'setup the initial config for Adjective'
-  task :setup do 
-    Adjective::Generators::SetupGenerator.new.copy_config
-  end
-
-  task :test do 
-    ap Adjective
-    path = ENV['ADJECTIVE_CONFIG_PATH']
-    ap path
-  end
-
-
-  namespace :db do 
-    desc 'generate all migrations from Adjective based on default settings'
-    task :generate_all_tables do 
-      path = ENV['ADJECTIVE_CONFIG_PATH'] ||= "config/adjective.yml"
-
-      # Load a copy of Adjective with the correct configs.
-      Adjective.configure do |config|
-        config.set_config_file_path(path)
-      end
-
-      
-
-      # template_migration_content = File.read('lib/templates/all_tables.rb')
-      # timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-
-      # migration_name = "create_all_adjective_tables"
-      # new_migration_file_name = "#{timestamp}_#{migration_name}.rb"
-      # new_migration_path = File.join('db', 'migrate', new_migration_file_name)
-
-      # File.open(new_migration_path, 'w') do |file|
-      #   file.write(template_migration_content)
-      # end
-
-      # puts "Created Adjective Migration at: #{new_migration_path}"
-    end
-  end
-end