cocoapods-dykit 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e86e26bdf418b936f1436c4dbded1363ebee8a77
-  data.tar.gz: 6052c4c46f3d94c7af19df146b61576168b86d45
+  metadata.gz: b051ed50ac8438ec738e883adfd25ef1f18f0289
+  data.tar.gz: da3ea5f10c18dae46cad5390e56351d12b39ba1d
 SHA512:
-  metadata.gz: e68c4a783150cc1b509487cc19987d5bd254159a51d5b4df0c536b9589a2bd1b3c1871394afa8720bd33555096dc298ff20f4ff2537c6ac947810dbf77145039
-  data.tar.gz: 2ee27311ae8d5a023bb465c40ec8e5dff00fcb781bec60aff2ac79fb3574f80836cb02e925aca83a77b72acd304d2a9897a50496c16b780fb10ef37f4bd83937
+  metadata.gz: 994f1feff06f59e7d46aecdb33148a6639c5bd81445d384d5372fd59cbd7019b27671ac3747f1f95558c81a8005c2c538ef976931c0a0e530ce2ae0f1ded60c0
+  data.tar.gz: c42e4ae8d9f3e3fdc014b9fe8a6e7ff98533753528fb95e3675cc1ee75c36e2a594fbc69aedac5213034a4bc19170385e6a4719ea4aec63fe21c71c07282c2ed

data/README.md

@@ -15,11 +15,11 @@
 $ pod lib dylint --sources=douyu,douyu-beijing,master --use-libraries --allow-warnings
 
 # 验证动态库
-pod lib dylint --sources=douyu,douyu-beijing,master --allow-warnings
+$ pod lib dylint --sources=douyu,douyu-beijing,master --allow-warnings
 
 # 推送静态库
-pod repo dypush douyu --use-libraries --allow-warnings --sources=douyu,douyu-beijing,master
+$ pod repo dypush douyu --use-libraries --allow-warnings --sources=douyu,douyu-beijing,master
 
 # 推送动态库
-pod repo dypush douyu --allow-warnings --sources=douyu,douyu-beijing,master
+$ pod repo dypush douyu --allow-warnings --sources=douyu,douyu-beijing,master
 ~~~

data/lib/pod/command.rb

@@ -1,2 +1,4 @@
 require 'pod/command/lib/dylint'
 require 'pod/command/repo/dypush'
+require 'pod/command/fmwk/create'
+require 'pod/command/fmwk/build'

data/lib/pod/command/fmwk/build.rb

@@ -0,0 +1,159 @@
+module Pod
+  class Command
+    # This is an example of a cocoapods plugin adding a top-level subcommand
+    # to the 'pod' command.
+    #
+    # You can also create subcommands of existing or new commands. Say you
+    # wanted to add a subcommand to `list` to show newly deprecated pods,
+    # (e.g. `pod list deprecated`), there are a few things that would need
+    # to change.
+    #
+    # - move this file to `lib/pod/command/list/deprecated.rb` and update
+    #   the class to exist in the the Pod::Command::List namespace
+    # - change this class to extend from `List` instead of `Command`. This
+    #   tells the plugin system that it is a subcommand of `list`.
+    # - edit `lib/cocoapods_plugins.rb` to require this file
+    #
+    # @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
+    #       in the `plugins.json` file, once your plugin is released.
+    #
+    class Fmwk < Command
+      class Build < Fmwk
+        self.summary = 'Build framework!'
+
+        self.description = <<-DESC
+          Build framework...!
+        DESC
+
+        def self.options
+          [
+            ['--workspace', '构建 workspace，若不指定，默认为构建 project'],
+            # ['--allow-warnings', 'Lint validates even if warnings are present'],
+            # ['--subspec=NAME', 'Lint validates only the given subspec'],
+            # ['--no-subspecs', 'Lint skips validation of subspecs'],
+            # ['--no-clean', 'Lint leaves the build directory intact for inspection'],
+            # ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
+            # ['--use-libraries', 'Lint uses static libraries to install the spec'],
+            # ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
+            #   '(defaults to https://github.com/CocoaPods/Specs.git). ' \
+            #   'Multiple sources must be comma-delimited.'],
+            # ['--private', 'Lint skips checks that apply only to public specs'],
+            # ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
+            #   'This takes precedence over a .swift-version file.'],
+            # ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
+            # ['--skip-tests', 'Lint skips building and running tests during validation'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @workspace           = argv.flag?('workspace')
+          # @allow_warnings  = argv.flag?('allow-warnings')
+          # @clean           = argv.flag?('clean', true)
+          # @fail_fast       = argv.flag?('fail-fast', false)
+          # @subspecs        = argv.flag?('subspecs', true)
+          # @only_subspec    = argv.option('subspec')
+          # @use_frameworks  = !argv.flag?('use-libraries')
+          # @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          # @private         = argv.flag?('private', false)
+          # @swift_version   = argv.option('swift-version', nil)
+          # @skip_import_validation = argv.flag?('skip-import-validation', false)
+          # @skip_tests = argv.flag?('skip-tests', false)
+          @framework_names = argv.arguments!
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          framework_names.each do |podspec|
+            `rm -rf #{build_path}` unless !Dir.exist?(build_path)
+
+            puts "打真机包..."
+            puts
+
+            output = xcodebuild(podspec)
+            puts output
+            puts 
+
+            puts "打模拟器包..."
+            puts
+            output = xcodebuild(podspec, :iphonesimulator)
+            puts output
+            puts
+            puts "生成合成包..."
+            puts
+            `lipo #{derived_data_path}/#{podspec}/Build/Products/Release-iphoneos/#{podspec}.framework/#{podspec} #{derived_data_path}/#{podspec}/Build/Products/Release-iphonesimulator/#{podspec}.framework/#{podspec} -create -output #{build_path}/#{podspec}`
+            `cp -r #{derived_data_path}/#{podspec}/Build/Products/Release-iphoneos/#{podspec}.framework #{build_path}/`
+            `cp -f #{build_path}/#{podspec} #{build_path}/#{podspec}.framework/`
+            `rm #{build_path}/#{podspec}`
+            puts "成功输出 framework 于 #{build_path}/#{podspec}.framework/"
+            puts
+          end
+        end
+
+        private
+
+        #----------------------------------------#
+
+        # !@group Private helpers
+
+        # @return [Pathname] The path of the podspec found in the current
+        #         working directory.
+        #
+        # @raise  If no podspec is found.
+        # @raise  If multiple podspecs are found.
+        #
+        def framework_names
+          if !@framework_names.empty?
+            Array(@framework_names)
+          else
+            raise Informative, 'Please type in a framework name!'
+          end
+        end
+
+        def derived_data_path
+          path = Dir.home + '/Documents/Temp/DerivedData'
+          `mkdir -p #{path}` unless Dir.exist?(path)
+          path
+        end
+
+        def build_path
+          path = Dir.pwd + '/build'
+          `mkdir -p #{path}` unless Dir.exist?(path)
+          path
+        end
+
+        def xcodebuild(target, type = :iphoneos, clean = true)
+          if clean
+            command = %W(clean build)
+          else
+            command = []
+          end
+
+          if @workspace
+            command += %W(-workspace #{target}.xcworkspace)
+          else
+            command += %W(-project #{target}.xcodeproj)
+          end
+          command += %W(-scheme #{target} -configuration Release -derivedDataPath #{derived_data_path}/#{target})
+          case type
+          when :iphoneos then command += %W(-sdk iphoneos)
+          when :iphonesimulator then command += %W(-sdk iphonesimulator)
+          end
+          # command += %W(| xcpretty)
+          output, status = _xcodebuild(command)
+          output
+        end
+
+        def _xcodebuild(command)
+          UI.puts 'xcodebuild ' << command.join(' ') if config.verbose
+          # Executable.capture_command('xcodebuild', command, :capture => :merge)
+          require 'open3'
+          Open3.pipeline('xcodebuild ' << command.join(' '), 'xcpretty')
+        end
+      end
+    end
+  end
+end

data/lib/pod/command/fmwk/create.rb

@@ -1,5 +1,3 @@
-# require File.expand_path('../validator.rb', __FILE__)
-require 'validator'
 module Pod
   class Command
     # This is an example of a cocoapods plugin adding a top-level subcommand
@@ -70,39 +68,17 @@ module Pod
 
         def run
           UI.puts
-          podspecs_to_lint.each do |podspec|
-            validator                = Pod::DyValidator.new(podspec, @source_urls)
-            validator.local          = true
-            validator.quick          = @quick
-            validator.no_clean       = !@clean
-            validator.fail_fast      = @fail_fast
-            validator.allow_warnings = @allow_warnings
-            validator.no_subspecs    = !@subspecs || @only_subspec
-            validator.only_subspec   = @only_subspec
-            validator.use_frameworks = @use_frameworks
-            validator.ignore_public_only_results = @private
-            validator.swift_version = @swift_version
-            validator.skip_import_validation = @skip_import_validation
-            validator.skip_tests = @skip_tests
-            validator.validate
-
-            unless @clean
-              UI.puts "Pods workspace available at `#{validator.validation_dir}/App.xcworkspace` for inspection."
-              UI.puts
-            end
-            if validator.validated?
-              UI.puts "#{validator.spec.name} passed validation.".green
-            else
-              spec_name = podspec
-              spec_name = validator.spec.name if validator.spec
-              message = "#{spec_name} did not pass validation, due to #{validator.failure_reason}."
-
-              if @clean
-                message << "\nYou can use the `--no-clean` option to inspect " \
-                  'any issue.'
-              end
-              raise Informative, message
-            end
+          framework_names.each do |podspec|
+            puts "开始创建 framework 工程 #{podspec}"
+            puts "创建目录..."
+            `mkdir -p \`pwd\`/#{podspec}/#{podspec}`
+            puts "下载模板..."
+            `curl http://gitlab.douyuios.com/huangluyang/my-shells/raw/master/framework_template.podspec -o #{podspec}/#{podspec}.podspec`
+            `curl http://gitlab.douyuios.com/huangluyang/my-shells/raw/master/LICENSE_template -o #{podspec}/#{podspec}/LICENSE`
+            puts "填充模板..."
+            `sed -i '' "s/<#lib name#>/#{podspec}/g" #{podspec}/#{podspec}.podspec`
+            puts "创建 framework 工程 #{podspec} 成功！"
+            puts ""
           end
         end
 
@@ -118,16 +94,11 @@ module Pod
         # @raise  If no podspec is found.
         # @raise  If multiple podspecs are found.
         #
-        def podspecs_to_lint
-          if !@podspecs_paths.empty?
-            Array(@podspecs_paths)
+        def framework_names
+          if !@framework_names.empty?
+            Array(@framework_names)
           else
-            podspecs = Pathname.glob(Pathname.pwd + '*.podspec{.json,}')
-            if podspecs.count.zero?
-              raise Informative, 'Unable to find a podspec in the working ' \
-                'directory'
-            end
-            podspecs
+            raise Informative, 'Please type in a framework name!'
           end
         end
       end

data/lib/pod/command/fmwk/upload.rb

@@ -0,0 +1,159 @@
+module Pod
+  class Command
+    # This is an example of a cocoapods plugin adding a top-level subcommand
+    # to the 'pod' command.
+    #
+    # You can also create subcommands of existing or new commands. Say you
+    # wanted to add a subcommand to `list` to show newly deprecated pods,
+    # (e.g. `pod list deprecated`), there are a few things that would need
+    # to change.
+    #
+    # - move this file to `lib/pod/command/list/deprecated.rb` and update
+    #   the class to exist in the the Pod::Command::List namespace
+    # - change this class to extend from `List` instead of `Command`. This
+    #   tells the plugin system that it is a subcommand of `list`.
+    # - edit `lib/cocoapods_plugins.rb` to require this file
+    #
+    # @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
+    #       in the `plugins.json` file, once your plugin is released.
+    #
+    class Fmwk < Command
+      class Build < Fmwk
+        self.summary = 'Build framework!'
+
+        self.description = <<-DESC
+          Build framework...!
+        DESC
+
+        def self.options
+          [
+            ['--workspace', '构建 workspace，若不指定，默认为构建 project'],
+            # ['--allow-warnings', 'Lint validates even if warnings are present'],
+            # ['--subspec=NAME', 'Lint validates only the given subspec'],
+            # ['--no-subspecs', 'Lint skips validation of subspecs'],
+            # ['--no-clean', 'Lint leaves the build directory intact for inspection'],
+            # ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
+            # ['--use-libraries', 'Lint uses static libraries to install the spec'],
+            # ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
+            #   '(defaults to https://github.com/CocoaPods/Specs.git). ' \
+            #   'Multiple sources must be comma-delimited.'],
+            # ['--private', 'Lint skips checks that apply only to public specs'],
+            # ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
+            #   'This takes precedence over a .swift-version file.'],
+            # ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
+            # ['--skip-tests', 'Lint skips building and running tests during validation'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @workspace           = argv.flag?('workspace')
+          # @allow_warnings  = argv.flag?('allow-warnings')
+          # @clean           = argv.flag?('clean', true)
+          # @fail_fast       = argv.flag?('fail-fast', false)
+          # @subspecs        = argv.flag?('subspecs', true)
+          # @only_subspec    = argv.option('subspec')
+          # @use_frameworks  = !argv.flag?('use-libraries')
+          # @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          # @private         = argv.flag?('private', false)
+          # @swift_version   = argv.option('swift-version', nil)
+          # @skip_import_validation = argv.flag?('skip-import-validation', false)
+          # @skip_tests = argv.flag?('skip-tests', false)
+          @framework_names = argv.arguments!
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          framework_names.each do |podspec|
+            `rm -rf #{build_path}` unless !Dir.exist?(build_path)
+
+            puts "打真机包..."
+            puts
+
+            output = xcodebuild(podspec)
+            puts output
+            puts 
+
+            puts "打模拟器包..."
+            puts
+            output = xcodebuild(podspec, :iphonesimulator)
+            puts output
+            puts
+            puts "生成合成包..."
+            puts
+            `lipo #{derived_data_path}/#{podspec}/Build/Products/Release-iphoneos/#{podspec}.framework/#{podspec} #{derived_data_path}/#{podspec}/Build/Products/Release-iphonesimulator/#{podspec}.framework/#{podspec} -create -output #{build_path}/#{podspec}`
+            `cp -r #{derived_data_path}/#{podspec}/Build/Products/Release-iphoneos/#{podspec}.framework #{build_path}/`
+            `cp -f #{build_path}/#{podspec} #{build_path}/#{podspec}.framework/`
+            `rm #{build_path}/#{podspec}`
+            puts "成功输出 framework 于 #{build_path}/#{podspec}.framework/"
+            puts
+          end
+        end
+
+        private
+
+        #----------------------------------------#
+
+        # !@group Private helpers
+
+        # @return [Pathname] The path of the podspec found in the current
+        #         working directory.
+        #
+        # @raise  If no podspec is found.
+        # @raise  If multiple podspecs are found.
+        #
+        def framework_names
+          if !@framework_names.empty?
+            Array(@framework_names)
+          else
+            raise Informative, 'Please type in a framework name!'
+          end
+        end
+
+        def derived_data_path
+          path = Dir.home + '/Documents/Temp/DerivedData'
+          `mkdir -p #{path}` unless Dir.exist?(path)
+          path
+        end
+
+        def build_path
+          path = Dir.pwd + '/build'
+          `mkdir -p #{path}` unless Dir.exist?(path)
+          path
+        end
+
+        def xcodebuild(target, type = :iphoneos, clean = true)
+          if clean
+            command = %W(clean build)
+          else
+            command = []
+          end
+
+          if @workspace
+            command += %W(-workspace #{target}.xcworkspace)
+          else
+            command += %W(-project #{target}.xcodeproj)
+          end
+          command += %W(-scheme #{target} -configuration Release -derivedDataPath #{derived_data_path}/#{target})
+          case type
+          when :iphoneos then command += %W(-sdk iphoneos)
+          when :iphonesimulator then command += %W(-sdk iphonesimulator)
+          end
+          # command += %W(| xcpretty)
+          output, status = _xcodebuild(command)
+          output
+        end
+
+        def _xcodebuild(command)
+          UI.puts 'xcodebuild ' << command.join(' ') if config.verbose
+          # Executable.capture_command('xcodebuild', command, :capture => :merge)
+          require 'open3'
+          Open3.pipeline('xcodebuild ' << command.join(' '), 'xcpretty')
+        end
+      end
+    end
+  end
+end

data/lib/pod/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsDylint
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/validator.rb

@@ -444,7 +444,6 @@ module Pod
         c.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = 'match Development *'
         c.build_settings['CODE_SIGN_IDENTITY'] = 'iPhone Developer'
         c.build_settings['DEVELOPMENT_TEAM'] = 'KW288R5J73'
-        c.build_settings['ENABLE_BITCODE'] = false
       end
       app_project.save
       app_project.recreate_user_schemes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dykit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - 黄露洋
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -75,7 +75,9 @@ files:
 - lib/cocoapods_plugin.rb
 - lib/pod/command.rb
 - lib/pod/command/fmwk.rb
+- lib/pod/command/fmwk/build.rb
 - lib/pod/command/fmwk/create.rb
+- lib/pod/command/fmwk/upload.rb
 - lib/pod/command/lib/dylint.rb
 - lib/pod/command/repo/dypush.rb
 - lib/pod/gem_version.rb
@@ -109,4 +111,3 @@ summary: Validates the Pod using the files in the working directory without simu
 test_files:
 - spec/command/dylint_spec.rb
 - spec/spec_helper.rb
-has_rdoc: