ormdev 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaa6f40f14ace8560f3e083effef9da172c6f0bd137bbf150816b27200d31d7b
-  data.tar.gz: f60a3f50414e664d2b0042034e3ee850c7d34ce2dccdc2d973326123de7aa769
+  metadata.gz: 0fbabc8c3500cdb0dd3fe8d510f172754c82353c6404113a58de311c62e08809
+  data.tar.gz: f1582483ec8ca6c2631f69affe15998e0ded1daf709cf4c56f6ed52941226b37
 SHA512:
-  metadata.gz: fbd23e30f20ac7ebf18e4259fe884c7fc8fb712fa3bf81fe0ff159a7f48384c07b7df75d0c63696c498e22653edcaccd63fad247698d468aeaef0935a4c2041f
-  data.tar.gz: 285967cd22e1908eb553fe46e4a7f5982ea1f0e36ae9e9c64b1747859a21612d69c8433e1dc436316323ec56448b3405d4aedde2b2938854b471f819334e03de
+  metadata.gz: 6bb861ab0ac000d8047d2b0892f505cfe3ec3487623e0152ca5aeab38a93e641d38dcf45c7757062b681cbc3f9946e036ec7525867de7a8a07caba10578faeb4
+  data.tar.gz: afb19db51b5ab04b4b65c73a4854b2762d6b6a714c81145e4e163cc8a3e4704b5f5a6235f6f5e43b4a9118861f93e7353ee1b967ba3c5ebc9896c7dfceab9376

data/Gemfile.lock

@@ -1,35 +1,22 @@
 PATH
   remote: .
   specs:
-    ormdev (0.0.2)
+    ormdev (0.0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    minitest (5.11.3)
     rake (10.4.2)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.17)
+  minitest (~> 5.0)
   ormdev!
   rake (~> 10.0)
-  rspec (~> 3.0)
 
 BUNDLED WITH
    1.17.1

data/README.md

@@ -26,7 +26,7 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require "rake/testtask"
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
 
-task :default => :spec
+task :default => :test

data/bin/ormdev

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
 
 require 'ormdev'
 
-ORM::Command.run(ARGV)
+OrmDev::Command.run(ARGV)

data/lib/ormdev/command/create.rb

@@ -1,6 +1,6 @@
 require_relative '../source/core/create_helper'
 
-module Ormdev
+module OrmDev
   class Command
     class Create < Command
       self.summary = '创建Orm插件模板工程。'
@@ -40,13 +40,9 @@ module Ormdev
       end
 
       def run
-        create = Ormdev::CreateHelper.new(@name, @prefix, @template_url)
-        create.setup(@fast, @skip)
-
-        create.clone_template
-        project_name = create.setup
-        create.print_info
-        Ormdev::Log.info "【create】Success!!! Please run command:\n cd #{@name} \n orm init #{project_name}"
+        create = OrmDev::CreateHelper.new(@name, @fast, @prefix, @template_url)
+        create.setup(@skip)
+        OrmDev::LogUtil.info "【create】Success!!! "
       end
     end
   end

data/lib/ormdev/command/lint.rb

@@ -0,0 +1,50 @@
+require 'cocoapods'
+
+require_relative '../source/util/sh_util'
+
+module OrmDev
+  class Command
+    class Lint < Command
+      self.summary = '验证本地插件pod仓库。'
+      self.description = <<-DESC
+          插件管理.
+          验证本地插件。
+      DESC
+
+      self.arguments = [
+          CLAide::Argument.new('PATH', false)
+      ]
+
+      def self.options
+        [
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @podspec_file = argv.shift_argument
+        @podspec_files = Pathname.pwd.children.select { |pn| pn.extname == '.podspec' }
+        super
+      end
+
+      def validate!
+        super
+        if @podspec_file
+          help! "podspec file at #{@podspec_file} does not exist" unless File.exist? @podspec_file
+          @podspec_path = @podspec_file
+        else
+          raise Pod::Informative, 'No podspec file found, please specify one' unless @podspec_files.length > 0
+          raise Pod::Informative, 'Multiple podspec file found, please specify one' unless @podspec_files.length == 1
+          @podspec_path = @podspec_files.first
+        end
+      end
+
+      def run
+        super
+        OrmDev::LogUtil.info '[插件管理] 验证Pod'.green
+        @spec = Pod::Specification.from_file(@podspec_path)
+        pod_lint_command = 'pod lib lint --sources=orm,master --allow-warnings --verbose --use-libraries'
+        OrmDev::SHUtil.run_command(pod_lint_command,'更验证Pod',false)
+      end
+    end
+  end
+end

data/lib/ormdev/command/publish.rb

@@ -0,0 +1,51 @@
+require 'cocoapods'
+
+require_relative '../source/core/run_helper'
+
+module OrmDev
+  class Command
+    class Publish < Command
+      self.summary = '发布插件'
+      self.description = <<-DESC
+          发布插件.
+          指定'插件名.podspec'的路径`PATH`。
+      DESC
+
+      self.arguments = [
+          CLAide::Argument.new('PATH', false)
+      ]
+
+      def self.options
+        [
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @podspec_file = argv.shift_argument
+        @podspec_files = Pathname.pwd.children.select { |pn| pn.extname == '.podspec' }
+        super
+      end
+
+      def validate!
+        super
+        # raise Pod::Informative, "No `Cimfile' found in the project directory." unless @cipfile_path.exist?
+        if @podspec_file
+          help! "podspec file at #{@podspec_file} does not exist" unless File.exist? @podspec_file
+          @podspec_path = @podspec_file
+        else
+          raise Pod::Informative, 'No podspec file found, please specify one' unless @podspec_files.length > 0
+          raise Pod::Informative, 'Multiple podspec file found, please specify one' unless @podspec_files.length == 1
+          @podspec_path = @podspec_files.first
+        end
+      end
+
+      def run
+        super
+        OrmDev::LogUtil.info '[插件发布] '.green
+        installer = OrmDev::RunHelper.new(@podspec_path)
+        installer.setup()
+        OrmDev::LogUtil.info "Success!!! Please run command:\n orm ipa \#{platform}"
+      end
+    end
+  end
+end

data/lib/ormdev/command/run.rb

@@ -0,0 +1,51 @@
+require 'cocoapods'
+
+require_relative '../source/core/run_helper'
+
+module OrmDev
+  class Command
+    class Run < Command
+      self.summary = '运行插件发布整个流程[检查运行环境、framwork、zip]'
+      self.description = <<-DESC
+          运行插件发布整个流程.
+          指定'插件名.podspec'的路径`PATH`。
+      DESC
+
+      self.arguments = [
+          CLAide::Argument.new('PATH', false)
+      ]
+
+      def self.options
+        [
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @podspec_file = argv.shift_argument
+        @podspec_files = Pathname.pwd.children.select { |pn| pn.extname == '.podspec' }
+        super
+      end
+
+      def validate!
+        super
+        # raise Pod::Informative, "No `Cimfile' found in the project directory." unless @cipfile_path.exist?
+        if @podspec_file
+          help! "podspec file at #{@podspec_file} does not exist" unless File.exist? @podspec_file
+          @podspec_path = @podspec_file
+        else
+          raise Pod::Informative, 'No podspec file found, please specify one' unless @podspec_files.length > 0
+          raise Pod::Informative, 'Multiple podspec file found, please specify one' unless @podspec_files.length == 1
+          @podspec_path = @podspec_files.first
+        end
+      end
+
+      def run
+        super
+        OrmDev::LogUtil.info '[插件发布] '.green
+        installer = OrmDev::RunHelper.new(@podspec_path)
+        installer.setup()
+        OrmDev::LogUtil.info "Success!!! Please run command:\n orm ipa \#{platform}"
+      end
+    end
+  end
+end

data/lib/ormdev/command/setup.rb

@@ -0,0 +1,37 @@
+require 'cocoapods'
+
+require_relative '../source/util/sh_util'
+
+module OrmDev
+  class Command
+    class Setup < Command
+      self.summary = '初始化pod仓库。'
+      self.description = <<-DESC
+          初始化pod仓库。
+      DESC
+
+      self.arguments = [
+      ]
+
+      def self.options
+        [
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        super
+      end
+
+      def validate!
+        super
+      end
+
+      def run
+        super
+        OrmDev::LogUtil.info '[插件开发] 初始化pod仓库'.green
+        OrmDev::SHUtil.run_command('pod repo add orm https://gitee.com/mvn/ios.git','更验证Pod',false)
+        OrmDev::SHUtil.run_command('pod repo update orm','更验证Pod',false)
+      end
+    end
+  end
+end

data/lib/ormdev/command.rb

@@ -1,20 +1,22 @@
 require 'claide'
 
-module Ormdev
-  # class Command < CLAide::Command
-  #
-  #   require 'ormdev/command/create'
-  #   require 'ormdev/command/package'
-  #   require 'ormdev/command/push'
-  #
-  #   self.abstract_command = true
-  #   self.command = 'orm'
-  #   self.version = ORM::VERSION
-  #   self.description = 'OriginalM —— 混合模式移动应用（Hybrid App）持续集成（Continuous Integration）工具包，用于构建、编译、测试、分发、部署的工具。'
-  #
-  #   def run
-  #     ORM::Log.info '* 开始执行orm … *'
-  #   end
-  #
-  # end
+module OrmDev
+  class Command < CLAide::Command
+
+    require 'ormdev/command/setup'
+    require 'ormdev/command/create'
+    require 'ormdev/command/lint'
+    require 'ormdev/command/run'
+    require 'ormdev/command/publish'
+
+    self.abstract_command = true
+    self.command = 'ormdev'
+    self.version = OrmDev::VERSION
+    self.description = 'OriginalM —— 混合模式移动应用（Hybrid App）持续集成（Continuous Integration）工具包，用于构建、编译、测试、分发、部署的工具。'
+
+    def run
+      OrmDev::LogUtil.info '* 开始执行orm … *'
+    end
+
+  end
 end

data/lib/ormdev/source/core/create_helper.rb

@@ -1,29 +1,49 @@
 require 'cocoapods'
 
-module ORM
+require_relative '../util/sh_util'
+
+module OrmDev
   class CreateHelper
 
-    ORM_PLUGIN_TEMPLATE_URL = "https://gitee.com/mvn/pod-template.git".freeze
+    ORMDEV_PLUGIN_TEMPLATE_URL = 'https://gitee.com/mvn/pod-plugin-template.git'.freeze
+    ORMDEV_PLUGIN_FAST_TEMPLATE_URL = 'https://gitee.com/mvn/pod-plugin-fast-template.git'.freeze
 
+    attr_reader :fast_build
     attr_reader :project_name
     attr_reader :class_prefix
     attr_reader :template_url
 
-    def initialize(name, prefix = '', template_url = ORM_TEMPLATE_TAG_VERSION)
+    def initialize(name, fast = false, prefix = '', template_url = nil)
       @project_name  = name
       @class_prefix  = prefix
-      @template_url = template_url
+      @fast_build = fast
+      if @fast_build then
+        @template_url = template_url || ORMDEV_PLUGIN_FAST_TEMPLATE_URL
+      else
+        @template_url = template_url || ORMDEV_PLUGIN_TEMPLATE_URL
+      end
     end
 
-    def setup(fast = false, skip= false)
-      if fast then
-        p '1111111======='
-        p Ormdev::SHUtil.run('ls -la')
+    def setup(skip= false)
+      if @fast_build then
+        clone_template
+        configure_template(skip)
+        print_info
       else
-        
+        create_command = "pod lib create #{@project_name} --template-url=#{@template_url}"
+        OrmDev::SHUtil.run_command(create_command,'创建ORM插件工程')
       end
     end
 
+    private
+
+    #----------------------------------------#
+
+    # !@group Private helpers
+
+    extend Pod::Executable
+    executable :git
+
     # Clones the template from the remote in the working directory using
     # the name of the Pod.
     #
@@ -31,7 +51,7 @@ module ORM
     #
     def clone_template
       Pod::UI.section("Cloning `#{template_repo_url}` into `#{@project_name}`.") do
-        svn! ['checkout', template_repo_url, @project_name]
+        git! ['clone', template_repo_url, @project_name]
       end
     end
 
@@ -39,13 +59,12 @@ module ORM
     #
     # @return [void]
     #
-    def setup
+    def configure_template(skip_open = false)
       string_replacements = {
           # "PROJECT_OWNER" => @configurator.user_name,
           "TODAYS_DATE" => Time.now.strftime("%m/%d/%Y"),
           "TODAYS_YEAR" => Time.now.year.to_s,
-          "PROJECT" => @project_name,
-          "OrmPro" => @class_prefix
+          "CIPPROJECT" => @project_name
       }
       Dir.glob(project_folder + "/**/**/**/**").each do |name|
         next if Dir.exists? name
@@ -59,36 +78,45 @@ module ORM
       end
 
       # shared schemes have project specific names
-      scheme_path = project_folder + "/PROJECT.xcodeproj/xcshareddata/xcschemes/"
+      scheme_path = project_folder + "/Example/CIPPROJECT.xcodeproj/xcshareddata/xcschemes/"
+
       raise Pod::Informative, 'No Xcode project shared schemes found, please specify one' unless Dir.exists? scheme_path
-      File.rename(scheme_path + "PROJECT.xcscheme", scheme_path +  @project_name + ".xcscheme")
+      File.rename(scheme_path + "CIPPROJECT-Example.xcscheme", scheme_path +  @project_name + "-Example.xcscheme")
 
       # rename xcproject
-      File.rename(project_folder + "/PROJECT.xcodeproj", File.join(project_folder, "#{@project_name}.xcodeproj"))
-
-      # change app file prefixes
-      ["OrmProAppDelegate.h", "OrmProAppDelegate.m"].each do |file|
-        before = project_folder + "/PROJECT/" + file
-        next unless File.exists? before
-
-        after = project_folder + "/PROJECT/" + file.gsub("OrmPro", @class_prefix)
-        File.rename before, after
-      end
-      safe_rename_file("#{project_folder}/PROJECTTests/PROJECTTests.m", "#{project_folder}/PROJECTTests/#{@project_name}Tests.m")
-      safe_rename_file("#{project_folder}/PROJECTUITests/PROJECTUITests.m", "#{project_folder}/PROJECTUITests/#{@project_name}UITests.m")
-      safe_rename_dir("#{project_folder}/PROJECT", "#{project_folder}/#{@project_name}")
-      safe_rename_dir("#{project_folder}/PROJECTTests", "#{project_folder}/#{@project_name}Tests")
-      safe_rename_dir("#{project_folder}/PROJECTUITests", "#{project_folder}/#{@project_name}UITests")
+      File.rename(project_folder + "/Example/CIPPROJECT.xcodeproj", File.join(project_folder, "Example/#{@project_name}.xcodeproj"))
+
+      # # change app file prefixes
+      # ["OrmProAppDelegate.h", "OrmProAppDelegate.m"].each do |file|
+      #   before = project_folder + "/PROJECT/" + file
+      #   next unless File.exists? before
+      #
+      #   after = project_folder + "/PROJECT/" + file.gsub("OrmPro", @class_prefix)
+      #   File.rename before, after
+      # end
+
+      # rename project related files
+      safe_rename_file("#{project_folder}/Example/CIPPROJECT.xcworkspace", "#{project_folder}/Example/#{@project_name}.xcworkspace")
+      safe_rename_file("#{project_folder}/Example/CIPPROJECT/CIPPROJECT-Info.plist", "#{project_folder}/Example/CIPPROJECT/#{@project_name}-Info.plist")
+      safe_rename_file("#{project_folder}/Example/CIPPROJECT/CIPPROJECT-Prefix.pch", "#{project_folder}/Example/CIPPROJECT/#{@project_name}-Prefix.pch")
+      safe_rename_file("#{project_folder}/Example/CIPPROJECT", "#{project_folder}/Example/#{@project_name}")
+      safe_rename_file("#{project_folder}/CIPPROJECT/Classes/CIPPROJECT.h", "#{project_folder}/CIPPROJECT/Classes/#{@project_name}.h")
+      safe_rename_file("#{project_folder}/CIPPROJECT/Classes/CIPPROJECT.m", "#{project_folder}/CIPPROJECT/Classes/#{@project_name}.m")
+      safe_rename_file("#{project_folder}/CIPPROJECT/Classes/CIPPROJECTAPI.h", "#{project_folder}/CIPPROJECT/Classes/#{@project_name}API.h")
+      safe_rename_file("#{project_folder}/CIPPROJECT/Classes/CIPPROJECTConst.h", "#{project_folder}/CIPPROJECT/Classes/#{@project_name}Const.h")
+      safe_rename_file("#{project_folder}/CIPPROJECT/Classes/CIPPROJECTConst.m", "#{project_folder}/CIPPROJECT/Classes/#{@project_name}Const.m")
+      safe_rename_file("#{project_folder}/CIPPROJECT/Classes/CIPPROJECTMacros.h", "#{project_folder}/CIPPROJECT/Classes/#{@project_name}Macros.h")
+      safe_rename_file("#{project_folder}/CIPPROJECT", "#{project_folder}/#{@project_name}")
+      safe_rename_file("#{project_folder}/CIPPROJECT.podspec", "#{project_folder}/#{@project_name}.podspec")
       reinitialize_svn_repo
-      "#{@project_name}.xcodeproj"
-    end
 
-    # Runs the template configuration utilities.
-    #
-    # @return [void]
-    #
-    def print_info
-      Pod::UI.puts "\nTo learn more about the template see `#{template_repo_url}`."
+      OrmDev::LogUtil.info "\nRunning " + "pod install".magenta + " on your new library."
+      Dir.chdir("#{project_folder}/Example") do
+        system "pod install"
+        OrmDev::LogUtil.info "  open '#{project_folder}/Example/#{@project_name}.xcworkspace'".magenta
+        system "open '#{@project_name}.xcworkspace'" unless skip_open
+      end
+      project_folder
     end
 
     private
@@ -97,9 +125,6 @@ module ORM
 
     # !@group Private helpers
 
-    extend Pod::Executable
-    executable :svn
-
     def project_folder
       @project_name
     end
@@ -120,12 +145,24 @@ module ORM
       end
     end
 
+
+
+
+
+    # Runs the template configuration utilities.
+    #
+    # @return [void]
+    #
+    def print_info
+      Pod::UI.puts "\nTo learn more about the template see `#{template_repo_url}`."
+    end
+
     # Checks if a template URL is given else returns the TEMPLATE_REPO URL
     #
     # @return String
     #
     def template_repo_url
-      @template_url || ORM_TEMPLATE_TAG_URL
+      @template_url || ORM_PLUGIN_TEMPLATE_URL
     end
   end
 end

data/lib/ormdev/source/core/run_helper.rb

@@ -0,0 +1,95 @@
+require 'cocoapods'
+
+require_relative '../util/sh_util'
+
+module OrmDev
+  class RunHelper
+    attr_reader :spec
+
+    def initialize(path)
+      @spec = Pod::Specification.from_file(path)
+    end
+
+    def setup()
+      task_start_time = Time.now
+      time_info_logs = ["开始运行：#{task_start_time}"]
+      start_time = task_start_time
+
+      if step == 0 || step == 0 then
+        check_environment
+        current_time = Time.new
+        time_info_logs << "检查运行环境:#{current_time - start_time}秒"
+        start_time = current_time
+      end
+
+      if step == 0 || step == 3 then
+        pod_package_framwork
+        current_time = Time.new
+        time_info_logs << "打包静态库:#{current_time - start_time}秒"
+        start_time = current_time
+      end
+
+      if step == 0 || step == 5 then
+        upload_zip_framwork
+        current_time = Time.new
+        time_info_logs << "上传静态framework:#{current_time - start_time}秒"
+      end
+
+      time_info_logs << "#{@spec.name}总耗时:#{Time.new - task_start_time}秒"
+      puts time_info_logs
+    end
+
+    private
+    # 检测运行环境
+    def check_environment
+      OrmDev::SHUtil.run_command('bundle install','检测配置运行环境',false)
+    end
+
+    # 静态化
+    def pod_package_framwork
+      pod_package_command = "#{@spec.name}_SOURCE=1 pod package #{@spec.name}.podspec --exclude-deps --no-mangle --force --spec-sources=git@gitee.com:mvn/ios.git,https://github.com/CocoaPods/Specs.git"
+      OrmDev::SHUtil.run_command(pod_package_command,'静态化插件')
+      destination_path = "#{@spec.name}/lib"
+      source_path = "#{@spec.name}-#{@spec.version}"
+      FileUtils.rm_rf(destination_path) if Dir.exist?(destination_path)
+      FileUtils.cp_r("#{source_path}/ios", destination_path)
+      FileUtils.rm_rf(source_path)
+      # 去除.a armv7s i386的架构
+      Dir.chdir(destination_path) do
+        lopo_remove_command = "lipo #{@spec.name}.framework/#{@spec.name} -remove armv7s -remove i386 -output #{@spec.name}.framework/#{@spec.name}"
+        lopo_info_command = "lipo -info #{@spec.name}.framework/#{@spec.name}"
+        OrmDev::SHUtil.run_command(lopo_remove_command,'移除framework armv7s i386的架构', false)
+        OrmDev::SHUtil.run_command(lopo_info_command,'framework支持架构')
+      end
+    end
+
+    # 压缩上传
+    def upload_zip_framwork
+      zip_path = "#{@spec.name}.zip"
+      FileUtils.rm_rf(zip_path) if File::exist?(zip_path)
+      Zip::File.open(zip_path, Zip::File::CREATE) do |zipfile|
+        [
+            "#{@spec.name}.podspec",
+            'LICENSE',
+            'README.md',
+            'Dependencies',
+            "#{@spec.name}/lib",
+        ].each do |filename|
+          add_file_to_zip(filename, zipfile)
+        end
+      end
+      zip_path
+      OrmDev::LogUtil.print_success "运行成功，#{zip_path}"
+    end
+
+    def add_file_to_zip(file_path, zip)
+      if File.directory?(file_path)
+        Dir.foreach(file_path) do |sub_file_name|
+          add_file_to_zip("#{file_path}/#{sub_file_name}", zip) unless sub_file_name == '.' or sub_file_name == '..'
+        end
+      else
+        zip.add(file_path, file_path)
+      end
+    end
+  end
+end

data/lib/ormdev/source/util/log_util.rb

@@ -1,15 +1,42 @@
+require 'date'
 require 'logger'
 
-module Ormdev
-  class Log
-    ORM_CLT_INFO_LOG_FLAG = '[ORM]'
+module OrmDev
+  class LogUtil
+
+    ORMDEV_CLT_INFO_LOG_FLAG = '[OrmDev]'
 
     def self.debug(msg = '')
       puts msg
     end
 
     def self.info(msg = '')
-      puts "#{ORM_CLT_INFO_LOG_FLAG}#{msg}"
+      puts "#{ORMDEV_CLT_INFO_LOG_FLAG}#{msg}"
+    end
+
+    def self.print_command(content)
+      puts content.green.bold
+    end
+
+    def self.print_success(content)
+      puts '****************************************'.green
+      puts "*    #{Time.new}         *".green
+      puts '*                                      *'.green
+      puts '*                 OK ~                 *'.green.bold
+      puts '*                                      *'.green
+      puts content
+      puts '****************************************'.green
+    end
+
+    def self.print_error(content)
+      puts '****************************************'.red
+      puts "*    #{Time.new}         *".red
+      puts '*                                      *'.red
+      puts '*               Error ~                *'.red.bold
+      puts '*                                      *'.red
+      puts content
+      puts '****************************************'.red
     end
+
   end
 end

data/lib/ormdev/source/util/sh_util.rb

@@ -1,80 +1,16 @@
-require 'fastlane'
+require_relative 'log_util'
 
-require_relative '../util/log_util'
-
-module Ormdev
+module OrmDev
   class SHUtil
-
     # 工具方法
     def self.run_command(command, message = '', abort = true)
       result = system(command) if command.is_a?(String)
-      ORM::LogUtil.print_command message
+      OrmDev::LogUtil.print_command message
       unless result then
-        ORM::LogUtil.print_error "操作内容：#{message}\n操作命令：#{command}"
+        OrmDev::LogUtil.print_error "操作内容：#{message}\n操作命令：#{command}"
         abort(message) if abort
       end
       result
     end
-
-    # Execute a shell command
-    # This method will output the string and execute it
-    # Just an alias for sh_no_action
-    # When running this in tests, it will return the actual command instead of executing it
-    # @param log [Boolean] should fastlane print out the executed command
-    # @param error_callback [Block] a callback invoked with the command output if there is a non-zero exit status
-    def self.sh(command, log: true, error_callback: nil)
-      sh_control_output(command, print_command: log, print_command_output: log, error_callback: error_callback)
-    end
-
-    def self.sh_no_action(command, log: true, error_callback: nil)
-      sh_control_output(command, print_command: log, print_command_output: log, error_callback: error_callback)
-    end
-
-    # @param command [String] The command to be executed
-    # @param print_command [Boolean] Should we print the command that's being executed
-    # @param print_command_output [Boolean] Should we print the command output during execution
-    # @param error_callback [Block] A block that's called if the command exits with a non-zero status
-    def self.sh_control_output(command, print_command: true, print_command_output: true, error_callback: nil)
-      print_command = print_command_output = true if $troubleshoot
-      # Set the encoding first, the user might have set it wrong
-      previous_encoding = [Encoding.default_external, Encoding.default_internal]
-      Encoding.default_external = Encoding::UTF_8
-      Encoding.default_internal = Encoding::UTF_8
-
-      command = command.join(' ') if command.kind_of?(Array) # since it's an array of one element when running from the Fastfile
-      FastlaneCore::UI.command(command) if print_command
-
-      result = ''
-
-      exit_status = nil
-      IO.popen(command, err: [:child, :out]) do |io|
-        io.sync = true
-        io.each do |line|
-          FastlaneCore::UI.command_output(line.strip) if print_command_output
-          result << line
-        end
-        io.close
-        exit_status = $?.exitstatus
-      end
-
-      if exit_status != 0
-        message = if print_command
-                    "Exit status of command '#{command}' was #{exit_status} instead of 0."
-                  else
-                    "Shell command exited with exit status #{exit_status} instead of 0."
-                  end
-        message += "\n#{result}" if print_command_output
-
-        error_callback.call(result) if error_callback
-        FastlaneCore::UI.shell_error!(message)
-      end
-
-      result
-    rescue => ex
-      raise ex
-    ensure
-      Encoding.default_external = previous_encoding.first
-      Encoding.default_internal = previous_encoding.last
-    end
   end
-end
+end

data/lib/ormdev/version.rb

@@ -1,3 +1,3 @@
-module Ormdev
-  VERSION = "0.0.2"
+module OrmDev
+  VERSION = "0.0.3"
 end

data/lib/ormdev.rb

@@ -1,6 +1,6 @@
 require "ormdev/version"
 
-module Ormdev
+module OrmDev
   class Error < StandardError; end
   # Your code goes here...
   autoload :Command,  'ormdev/command'

data/ormdev.gemspec

@@ -5,16 +5,16 @@ require "ormdev/version"
 require 'date'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ormdev"
-  spec.version       = Ormdev::VERSION
+  spec.name          = 'ormdev'
+  spec.version       = OrmDev::VERSION
   spec.date          = Date.today
-  spec.authors       = ["ormdev"]
-  spec.email         = ["ormdev@163.com"]
+  spec.authors       = ['devorm']
+  spec.email         = ['devorm@163.com']
 
-  spec.summary       = %q{Hybrid App（混合模式移动应用）核心打包工具.技术支持：devorm@163.com.}
+  spec.summary       = %q{Hybrid App（混合模式移动应用）核心打包工具.技术支持：devorm@163.com..}
   spec.description   = %q{Hybrid App，混合模式移动应用，兼具“Native App良好用户交互体验的优势”和“Web App跨平台开发的优势”。 }
-  spec.homepage      = "https://gitee.com/mvn/ormdev"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://gitee.com/mvn/ormdev'
+  spec.license       = 'MIT'
   spec.post_install_message = %q(
             _____   __  __  ________
            / ___ \ / / / / / _  _  /
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   # if spec.respond_to?(:metadata)
   #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
+  #
   #   spec.metadata["homepage_uri"] = spec.homepage
   #   spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
   #   spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
@@ -46,11 +46,13 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  # spec.bindir        = "exe"
+  spec.bindir        = 'bin'
+  # spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = ['ormdev']
+  spec.require_paths = ['lib']
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ormdev
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
-- ormdev
+- devorm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,26 +39,24 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 description: 'Hybrid App，混合模式移动应用，兼具“Native App良好用户交互体验的优势”和“Web App跨平台开发的优势”。 '
 email:
-- ormdev@163.com
+- devorm@163.com
 executables:
-- console
 - ormdev
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -77,9 +75,12 @@ files:
 - lib/ormdev.rb
 - lib/ormdev/command.rb
 - lib/ormdev/command/create.rb
-- lib/ormdev/command/package.rb
-- lib/ormdev/command/push.rb
+- lib/ormdev/command/lint.rb
+- lib/ormdev/command/publish.rb
+- lib/ormdev/command/run.rb
+- lib/ormdev/command/setup.rb
 - lib/ormdev/source/core/create_helper.rb
+- lib/ormdev/source/core/run_helper.rb
 - lib/ormdev/source/util/log_util.rb
 - lib/ormdev/source/util/sh_util.rb
 - lib/ormdev/version.rb
@@ -110,5 +111,5 @@ rubyforge_project:
 rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
-summary: Hybrid App（混合模式移动应用）核心打包工具.技术支持：devorm@163.com.
+summary: Hybrid App（混合模式移动应用）核心打包工具.技术支持：devorm@163.com..
 test_files: []