mybatis-cli 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6779c969c47a7014a59fd584fb9a2ef70bb5e13e
-  data.tar.gz: 9a677071123db85bc3efbc50924cee6b6a5bae8a
+  metadata.gz: 1e68122feb93f8115ea7b84a5d73ed704b9a22bb
+  data.tar.gz: 7fb46b24c07c2b3cf54510fb9e3679469e542b33
 SHA512:
-  metadata.gz: b3d6557ab9cc800b8f33c607e37363ba3de7d2ff09d03fff2eb014e0a7cdbb618d165a4691b14d3dea3d8e7db96dd2b221a9214465f6ad21ff063673a2210f3c
-  data.tar.gz: c81199059489597f9f9a22220adf562efe8471c9054262d153efd5ee004bd541ac2629f9ab77d7dcbf1a17ffac8fe4941f73784c8a12c08adbf7aa09b4cc8903
+  metadata.gz: 4dc9a576a7fb7c345afbe2ec0893af498afbf7c28ec2d4c7735c4891df8c405aa954df8a88c008785dec979f51a23dd31305476859243d8ba2c0d5e93e7c9cf3
+  data.tar.gz: b75f861f20be37825effa8b7ea0ba0c4c375cb6e12f705b71ec7e60d872542a8324917c3f6fe0aed46e8b2cc0c5ca718740f6fb9ddbd4c130d7bf43bf00d8b60

data/.gitignore

@@ -13,4 +13,5 @@
 *.a
 mkmf.log
 .idea
-*.gem
+*.gem
+src

data/README.md

@@ -24,7 +24,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/mybatis-cli/fork )
+1. Fork it ( https://github.com/typ0520/mybatis-cli/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/mybatis

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'mybatis'
+require_relative '../lib/mybatis-cli'
 
 begin
   system "export LC_ALL=en_US.UTF-8;export LC_CTYPE=en_US.UTF-8;export LANG=en_US.UTF-8"

data/lib/mybatis-cli.rb

@@ -0,0 +1 @@
+require_relative '../lib/mybatis'

data/lib/mybatis/builder/mapper_builder.rb

@@ -38,9 +38,13 @@ module Mybatis
     def get_mapper_path(workspace,context)
       mapper_path = workspace
       mapper_path << '/' unless mapper_path.end_with? '/'
-      mapper_path << context.package.gsub(/\./,'/') if context.package
+      if context.mapper_package != ''
+        mapper_path << context.mapper_package.gsub(/\./,'/')
+      else
+        mapper_path << context.package.gsub(/\./,'/') if context.package
+        mapper_path << 'mapper'
+      end
       mapper_path << '/' unless mapper_path.end_with? '/'
-      mapper_path << 'mapper/'
     end
   end
 end

data/lib/mybatis/builder/mapper_xml_builder.rb

@@ -67,9 +67,13 @@ module Mybatis
     def get_mapper_xml_path(workspace,context)
       mapper_path = workspace
       mapper_path << '/' unless mapper_path.end_with? '/'
-      mapper_path << context.package.gsub(/\./,'/') if context.package
+      if context.mapper_package != ''
+        mapper_path << context.mapper_package.gsub(/\./,'/')
+      else
+        mapper_path << context.package.gsub(/\./,'/') if context.package
+        mapper_path << 'mapper'
+      end
       mapper_path << '/' unless mapper_path.end_with? '/'
-      mapper_path << 'mapper/'
     end
 
     def get_class_path(context)

data/lib/mybatis/cli.rb

@@ -7,10 +7,11 @@ module Mybatis
     desc "generate -p package -n name table_columns", "Build po-class,mapper-class,mapper-xml (alias: 'g')."
     map ["g"] => :generate
 
-    method_option :name,             type: :string, aliases: "-n", :required => true, desc: "po class name"
-    method_option :package,          type: :string, aliases: "-p", default: "mybatis-cli" , desc: "po class package name"
-    method_option :tablename,        type: :string, aliases: "-t", default: '' , desc: "table name"
-    method_option :list,             type: :array,  aliases: "-l", :required => true, desc: "table columns"
+    method_option :name,             type: :string, aliases: "-n",  :required => true, desc: "po class name"
+    method_option :package,          type: :string, aliases: "-p",  default: '' , desc: "po class package name"
+    method_option :mapper_package,   type: :string, aliases: "-m", default: '' , desc: "mapper class package name"
+    method_option :tablename,        type: :string, aliases: "-t",  default: '' , desc: "table name"
+    method_option :list,             type: :array,  aliases: "-l",  :required => true, desc: "table columns"
 
     def generate *args
       Mybatis.generate(*args, options)

data/lib/mybatis/util/context.rb

@@ -19,6 +19,7 @@ module Mybatis
 
     class GenerateContext
       attr_accessor :package
+      attr_accessor :mapper_package
       attr_accessor :po_name
       attr_accessor :table_name
       attr_accessor :attributes
@@ -26,8 +27,10 @@ module Mybatis
       class << self
         def instance_with_options options
           #{"package"=>"package", "name"=>"Order", "tablename"=>"t_order", "list"=>["id", "order_no", "create_time"]}
+          p options
           context = self.new
           context.package = options[:package]
+          context.mapper_package = options[:mapper_package]
           context.po_name = options[:name].upcase_first
           context.table_name =
               options[:tablename] != '' ? options[:tablename] : "t#{context.po_name.replace_upcase_to_underline}"

data/lib/mybatis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Mybatis
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mybatis-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - tong
@@ -67,6 +67,7 @@ files:
 - Rakefile
 - bin/mybatis
 - changelog.txt
+- lib/mybatis-cli.rb
 - lib/mybatis.rb
 - lib/mybatis/builder/builder.rb
 - lib/mybatis/builder/mapper_builder.rb