ormdev 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52473a5610798b6c4cac93a671ae0b55c452fba5d7815b7cecf80e925acef601
-  data.tar.gz: 7bcebd831048dafbacaa1c10999f45213d24efe8a074f7a5cca26ca6299fe1b1
+  metadata.gz: 0d2bdbfdfcd5e054ba3331fabb1aec411d9c2b7eee6622473026cab8a975a0ad
+  data.tar.gz: 558371dd86d508d209426f1dab8e507b2cfaa42690d51cda8754fa2302092096
 SHA512:
-  metadata.gz: b1bca7e67150b27d0e74608edc7a5f5259a08e1fe9297e809848886dba092df36a40b64eaf8a9d55436f85d51cad2beb22a8df55276a7e1ea1fe8a92bae57304
-  data.tar.gz: 102cc83d26fbb4202073769e52e32b422baaf22a67b02dc94d7bd18c31834e1020c07502f7cca507b844e85ed33a0ab43c513b0bf57da5155484975335330c38
+  metadata.gz: ed6668d63d1188e392bd2b0860622a155299cd3327be02b21e41d15b16d0ac36351d29395bde452adf2f85b2830dc8e4759f99d6f20ff5d433133380161a2e7d
+  data.tar.gz: 26da2af8226a9abe7d892eaa3188fe69178f1181115d1e3d1bfaedb70e15f294c8778e0ba17d33e5bbf09ab612ec4ec0469ff1a27b814fbbb8ca08632bb563e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ormdev (0.1.7)
+    ormdev (0.1.8)
       claide (~> 1.0, >= 1.0.2)
       cocoapods (~> 1.5, >= 1.5.3)
       cocoapods-packager (~> 1.5)

data/lib/ormdev/command/create.rb

@@ -7,6 +7,10 @@ module OrmDev
 
       self.description = <<-DESC
           新建 iOS => Application => Single View Application 工程，工程名为`NAME`
+
+          zip插件模板创建：
+
+          'ormdev create --template-url=http://112.65.142.83:7788/ceshi/tmpl/pod-fast-template.zip --fast CIPXxx'
       DESC
 
       self.arguments = [
@@ -15,7 +19,7 @@ module OrmDev
 
       def self.options
         [
-            ['--template-url=URL', 'Orm插件模板git地址'],
+            ['--template-url=URL', 'Orm插件模板git地址，或者zip地址'],
             ['--fast', '快速创建Orm插件模板工程（带测试用例）'],
             ['--prefix=XXX', 'Orm插件模板工程前缀(fast有效)'],
             ['--skip', '跳过打开Orm插件模板工程(fast有效)'],
@@ -37,6 +41,9 @@ module OrmDev
         help! 'The Pod name cannot contain spaces.' if @name =~ /\s/
         help! 'The Pod name cannot contain plusses.' if @name =~ /\+/
         help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
+        unless @template_url then
+          help! '模板地址只能是以[git|zip]结尾的地址.' if !(@template_url.downcase.end_with?('.git') || @template_url.downcase.end_with?('.zip'))
+        end
       end
 
       def run

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

@@ -1,6 +1,8 @@
 require 'cocoapods'
+require 'zip'
 
 require_relative '../util/sh_util'
+require_relative '../util/download_util'
 
 module OrmDev
   class CreateHelper
@@ -54,8 +56,28 @@ module OrmDev
     # @return [void]
     #
     def clone_template
-      Pod::UI.section("Cloning `#{template_repo_url}` into `#{@project_name}`.") do
-        git! ['clone', template_repo_url, @project_name]
+      if @template_url.downcase.end_with?('.zip') then
+        unzip_dir = File.basename(@template_url, 'zip')
+        abort('插件目录本地已存在。') if Dir.exist?(unzip_dir)
+        zip_path = File.join('./', File.basename(@template_url))
+
+        if (@template_url.downcase.start_with?('http://') || @template_url.downcase.start_with?('https://')) then
+          OrmDev::DownloadUtil.download( @template_url, zip_path )#Pathname.pwd
+          OrmDev::LogUtil.info "【创建插件工程】下载#{@template_url}到#{zip_path}"
+        elsif File.exist?(@template_url) then
+          OrmDev::LogUtil.info "【创建插件工程】复制#{@template_url}到#{zip_path}"
+          FileUtils.cp( @template_url, zip_path )
+        end
+        abort('插件模板zip下载失败') unless File.exist? zip_path
+        # 解压模板
+        result = OrmDev::SHUtil.run_command("unzip #{zip_path}",'解压模板工程', false)
+        File.rename('CIPPROJECT', @project_name)
+        FileUtils.rm zip_path
+        abort('插件模板zip解压失败') unless result
+      else
+        Pod::UI.section("Cloning `#{template_repo_url}` into `#{@project_name}`.") do
+          git! ['clone', template_repo_url, @project_name]
+        end
       end
     end
 
@@ -68,7 +90,8 @@ module OrmDev
           # "PROJECT_OWNER" => @configurator.user_name,
           "TODAYS_DATE" => Time.now.strftime("%m/%d/%Y"),
           "TODAYS_YEAR" => Time.now.year.to_s,
-          "CIPPROJECT" => @project_name
+          "CIPPROJECT" => @project_name,
+          "cipPROJECT" => @project_name.gsub(/^CIP/, 'cip'),#模板替换，插件名->js对象
       }
       Dir.glob(project_folder + "/**/**/**/**").each do |name|
         next if Dir.exists? name
@@ -103,6 +126,9 @@ module OrmDev
       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/asset/www/V2/data/CIPPROJECT.js", "#{project_folder}/Example/CIPPROJECT/asset/www/V2/data/#{@project_name}.js")
+      safe_rename_file("#{project_folder}/Example/CIPPROJECT/asset/www/V2/html/CIPPROJECT.html", "#{project_folder}/Example/CIPPROJECT/asset/www/V2/html/#{@project_name}.html")
       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")
@@ -112,6 +138,7 @@ module OrmDev
       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
 
       OrmDev::LogUtil.info "\nRunning " + "pod install".magenta + " on your new library."
@@ -135,6 +162,7 @@ module OrmDev
 
     def reinitialize_svn_repo
       `rm -rf .svn`
+      `rm -rf .git`
     end
 
     def safe_rename_dir(old, dir_name)

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

@@ -0,0 +1,39 @@
+require 'net/http'
+require 'uri'
+require 'ruby-progressbar'
+
+module OrmDev
+  class DownloadUtil
+    def self.download(url, save_path, title = '文件')
+      uri = URI(url)
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        request = Net::HTTP::Get.new uri
+        http.request request do |response|
+          file_size = response['content-length'].to_i
+          pbar = ProgressBar.create(:title => title, :starting_at => 0, :total => file_size, :format => '%a |%b>>%i| %p%% %t')
+          amount_downloaded = 0
+          File.open save_path, 'wb' do |io| # 'b' opens the file in binary mode
+            response.read_body do |chunk|
+              io.write chunk
+              amount_downloaded += chunk.size
+              pbar.progress=amount_downloaded
+              # puts "%.2f%" % (amount_downloaded.to_f / file_size * 100)
+            end
+          end
+          pbar.finish
+        end
+      end
+    end
+
+    def self.download_cp(path, save_dir, save_name, title = '文件')
+      save_path = File.join(save_dir, save_name)
+      FileUtils.mkdir_p(save_dir) unless Dir.exist?(save_dir)
+      FileUtils.rm_rf(save_path) if Dir.exist?(save_path)
+      if (path.downcase.start_with?('http://') || path.downcase.start_with?('https://')) then
+        ORM::DownloadUtil.download(path, save_path, title )
+      else
+        FileUtils.cp( path, save_path )
+      end
+    end
+  end
+end

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

@@ -112,7 +112,7 @@ module OrmDev
       info
     end
 
-    ORMDEV_CLT_API_THIRD_PLUGIN_CHECK
+
 
 
     private

data/lib/ormdev/version.rb

@@ -1,3 +1,3 @@
 module OrmDev
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ormdev
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - devorm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -205,6 +205,7 @@ files:
 - lib/ormdev/command/update.rb
 - lib/ormdev/source/core/create_helper.rb
 - lib/ormdev/source/core/run_helper.rb
+- lib/ormdev/source/util/download_util.rb
 - lib/ormdev/source/util/http_util.rb
 - lib/ormdev/source/util/log_util.rb
 - lib/ormdev/source/util/sh_util.rb
@@ -219,7 +220,7 @@ post_install_message: "\e[32m\n            _____   __  __  ________\n
   ___ \\ / / / / / _  _  /\n          / /  / // /_/ / / // // /\n         / /  / //
   ____/ / // // /\n        / /__/ // /     / // // /\n        \\_____//_/     /_//_//_/
   \   Dev\n\n\n         -- 欢迎使用OrmDev for iOS --\n      ---- 技术支持：devorm@163.com ----\n\n
-  \ \e[0m\t\t\t\tv0.1.7\n\n"
+  \ \e[0m\t\t\t\tv0.1.8\n\n"
 rdoc_options: []
 require_paths:
 - lib