weapon 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7b98eef2fed257f65d7a388c123f7265d3a0111
-  data.tar.gz: 545bc73a573868385e9c900cf2b0c8617a50a493
+  metadata.gz: a488fb189fbefd59f4d2bb80b4688e575a2b8eb1
+  data.tar.gz: d3b80d39dd07a7a136df60c11c2b5de5b65c06c3
 SHA512:
-  metadata.gz: bfb7909bf9c3cabeb2cf381490ddcc570d20f8f3908453e2c7d5d67b334f8ace4c1a48489a9c42949f7d4b698b83b1db6480a309d12b58faafed0ec1b690d1fd
-  data.tar.gz: 8bf36672904e2e173cd9ec95f444915b197aa1c2911c8e563ee46a3279b6882c24a6b34491939f4d01f226c9b9da1b3a0d1ab8b05b56233383681104d0e4f82b
+  metadata.gz: 0391f8b3b33ad961172ec9b0d1d2af2513f5ef3a0942c2c38ac6c826efe341e1ae9e16df32848f149dfd4fad2a36807bdc6a51f8ac4dd6972a37e4ce4a329d03
+  data.tar.gz: be475562fee373f5d89796aa15c5adfbe84cc316cd518bf62feb43a38f820965c3a904ecf2698a30891aaacb5931278cd23c6ef4bfac45103d65ee5a09ceace6

data/lib/support/model_from_sql/model_from_sql_generator.rb

@@ -2,22 +2,72 @@ class ModelFromSqlGenerator < Rails::Generators::Base
   source_root File.expand_path("../templates", __FILE__)
 
   def build_models
+    ap 'args is '
+    ap args[0]
     tables = ActiveRecord::Base.connection.tables
 
     Rails.application.eager_load!
     in_models = ActiveRecord::Base.descendants.map(&:table_name)
+    ap 'tables from database'
+    ap tables
     ap in_models
     new_tables = tables - in_models - ['schema_migrations', 'ar_internal_metadata']
+    if args[0]
+      new_tables = new_tables.select {|table| table.include?(args[0])}
+    end
+
+
+    ap 'new tables'
+    ap new_tables
 
     new_tables.each do |table_name|
       generate "model #{table_name} --skip-migration" # or whatever you want here
       model_file = "app/models/#{table_name.singularize}.rb"
+      ap 'new model file'
+      ap 'output columns'
+      self.generate_migrate(table_name)
+      ap model_file
       inject_into_file model_file, before: "end\n" do <<-'RUBY'
   self.table_name = "table_name_replace"
       RUBY
       end
       gsub_file model_file, 'table_name_replace', table_name
     end
+  end
 
+  def generate_migrate(table_name)
+    valid_columns = ActiveRecord::Base.connection.columns(table_name).select {|column| !['id', 'created_at', 'updated_at'].include?(column.name)}
+    ap valid_columns
+    add_columns = valid_columns.map do |column|
+      ap column
+      ap column.name
+      ap column.default
+      ap column.comment
+      ap column.sql_type_metadata
+      sql = "add_column :#{column.table_name}, :#{column.name}, :#{column.sql_type_metadata.type}"
+      sql += ", default: #{column.default}" if column.default && column.default.is_a?(Integer)
+      sql += ", default: '#{column.default}'" if column.default && column.default.is_a?(String)
+      sql += ", comment: '#{column.comment}'" if column.comment
+      sql += ", null: #{column.null}"
+      sql
+    end
+    ap add_columns
+    migrate_file = "db/migrate/#{Time.now.strftime("%Y%m%d%H%M%S")}_create_#{table_name}.rb"
+    run "touch #{migrate_file}"
+    run "echo 'replace\n' >> #{migrate_file}"
+    inject_into_file migrate_file, before: "replace\n" do <<-'RUBY'
+class CreateModelReplace < ActiveRecord::Migration
+  def change
+    create_table :table_replace
+    add_columns
+  end
+end
+    RUBY
+    end
+    gsub_file migrate_file, 'ModelReplace', table_name.camelize
+    gsub_file migrate_file, 'add_columns', add_columns.join("\n    ")
+    gsub_file migrate_file, 'table_replace', table_name.pluralize
+    gsub_file migrate_file, 'replace', ''
   end
+
 end

data/lib/support/util.rb

@@ -0,0 +1,10 @@
+Fixnum.class_eval do
+  def to_duration
+    day = (self / 86400).to_i
+    if day == 0
+      Time.at(self).utc.strftime("%H:%M:%S")
+    else
+      day.to_s + ':' + Time.at(self).utc.strftime("%H:%M:%S")
+    end
+  end
+end

data/lib/weapon.rb

@@ -131,17 +131,20 @@ class Weapon < Thor
   end
 
   desc "model_from_sql", "build model from sql"
+  method_option :contain, :type => :string, :default => '', :required => false
   def model_from_sql
     makesure_in_git
     FileUtils.mkdir_p "lib/generators/model_from_sql"
     copy_file 'support/model_from_sql/model_from_sql_generator.rb', 'lib/generators/model_from_sql/model_from_sql_generator.rb'
     run 'git add lib/'
-    run 'rails g model_from_sql'
+    run "rails g model_from_sql #{options.contain}"
     run 'git add app/'
     run 'git add spec/'
     run 'git add test/'
     run 'git add lib/'
+    run 'git add db/migrate'
     run 'git commit -a -m "add model_from_sql generator and build models from sql"'
+    run 'annonate'
   end
 
   desc "build all activeadmin page ", "build all activeadmin page"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weapon
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - seaify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,6 +114,7 @@ files:
 - lib/support/model_from_sql/model_from_sql_generator.rb
 - lib/support/rails_settings_ui/rails_settings_ui.rb
 - lib/support/rails_settings_ui/setting.rb
+- lib/support/util.rb
 - lib/weapon.rb
 homepage: https://github.com/seaify/weapon
 licenses:
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: weapon for rails application!