luna-binary-uploader 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 116426b3ff192fe626ed285d524284bf5fad7a33c82ce59b3d43c4ce7204c62a
-  data.tar.gz: c07ff3d27936481b281771b1a4aa82dacef88a87384b78f04eb11cb6c8eeeb58
+  metadata.gz: 69f6dde43552f8b6f3c016abed8c0efe2df08f975afebd16d5d15786059564b7
+  data.tar.gz: 449f282e177e6d6125dde7672ad3cdf1b34e114cefc32b0f6e3f9bc417629558
 SHA512:
-  metadata.gz: 541c3bcbe9802971456300bff08f6818c0055234f3302132d3d61c2dfb50f40ec227e5b0e74a38b7f4a2b284189239985a995616f402aeb4d3dffb5787306369
-  data.tar.gz: 4de07acdddd8808404e866c54a7517de3c3761155f7dbbe9392fba2ec2698372c650bd5d29bcf51f1d56502d1e1ed22400f72e0d4e24a2c838ff2c9d6df3c65c
+  metadata.gz: 9b28579c5ffa2121188c4f96b9dd6a660cf4a4948ce5b500556d82e5650a39e1c8c7a14b1da7d5b6086a438780ab61d11271fd43d7d45474495f8af1929544a2
+  data.tar.gz: 6bfba261965ef5bc34e54746fc1c45e34e4d86aee2c83eccbf7d49701148d29519671d84f1656ed860e2d695ed639dd559f111b33abf51e831e1fb87c34131a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    luna-binary-uploader (0.1.21)
+    luna-binary-uploader (0.1.25)
       cocoapods
       cocoapods-generate (~> 2.0.1)
       cocoapods-imy-bin (= 0.3.1.3)
@@ -11,9 +11,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.4)
+    CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -123,13 +123,13 @@ GEM
     gh_inspector (1.1.3)
     gli (2.19.0)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    json (2.6.0)
+    json (2.6.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
-    minitest (5.14.4)
+    minitest (5.15.0)
     molinillo (0.8.0)
     multi_test (0.1.2)
     nanaimo (0.3.0)
@@ -159,7 +159,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby

data/bin/lbu

@@ -21,59 +21,28 @@ class App
     subcommand_option_handling :normal
     arguments :strict
   
-    desc 'Describe some switch here'
-    switch [:s,:switch]
-  
-    desc 'Describe some flag here'
-    default_value 'the default'
-    arg_name 'The name of the argument'
-    flag [:f,:flagname]
-  
-    desc 'Describe list here'
-    arg_name 'Describe arguments to list here'
-    command :list do |c|
-      c.desc 'Describe a switch to list'
-      c.switch :s
-  
-      c.desc 'Describe a flag to list'
-      c.default_value 'default'
-      c.flag :f
-      c.action do |global_options,options,args|
-  
-        # Your command logic here
-  
-        # If you have any errors, just raise them
-        # raise "that command made no sense"
-  
-        puts "list command ran"
-      end
-    end
-  
     desc '初始化二进制配置repo代码'
     arg_name 'url地址'
     command :init do |c|
       c.action do |global_options,options,args|
-        if args[0]
-          Luna::Binary::Init.new(args[0])
-        else
-          raise "添加url地址"
-        end
+        help_now!('url is required') if args.empty?
+        Luna::Binary::Init.new(args[0])
       end
     end
 
 
     desc '对pod install封装，一键开关二进制'
-    arg_name '只接参数n, 表示不用二进制 '
+    arg_name ''
     command :install do |c|
+      c.desc '是否需要二进制, 不需要的话 -n or --no'
+      c.switch [:n,:no]
       c.action do |global_options,options,args|
-        if args[0] && args[0] != "n"
-          raise "只接参数n, 表示不用二进制"
-        elsif args[0] && args[0] == "n"
+        if options[:no]
           is_open = "false"
         else
           is_open = "true"
         end
-        Luna::Binary::Install.new(is_open)     
+        Luna::Binary::Install.new(is_open)
       end
     end
 
@@ -120,11 +89,10 @@ class App
     arg_name '1.模块名 2.版本号'
     command :del do |c|
       c.action do |global_options,options,args|
-        if args[0] && args[1]
-          Luna::Binary::Delete.new(args[0],args[1]).delete
-        else
-          raise "缺少参数：1.模块名 2.版本号"
-        end
+        help_now!('args is required') if args.empty?
+        help_now!('模块名是需要的') if args[0] == nil
+        help_now!('版本号是需要的') if args[1] == nil
+        Luna::Binary::Delete.new(args[0],args[1]).delete
       end
     end
 
@@ -146,28 +114,31 @@ class App
     desc '仅仅更新服务的framwork，podfile带有标志位的:dev_env_use_binary的模块framework，通常解决xcode升级导致framework swift 版本问题'
     arg_name '参数:1.二进制路径(可以不传默认为当前目录下的/temp-luna-uploader/merged)'
     command :refresh do |c|
+      c.desc '是否需要build, 不需要的话 -n or --no'
+      c.switch [:n,:no]
       c.action do |global_options,options,args|
+        if options[:no]
           obj = Luna::Binary::Refresh.new()
           if args[0] != nil
-            obj.binary_path = args[0]  
+            obj.binary_path = args[0]
           else
             obj.binary_path = Luna::Binary::Common.instance.binary_path_merged
           end
           obj.run
-      end
-    end
-
-    desc '检查并上传带有标记:dev_env_use_binary的模块，上传repo和framework'
-    arg_name '参数:1.二进制路径(可以不传默认为当前目录下的/temp-luna-uploader/merged)'
-    command :update do |c|
-      c.action do |global_options,options,args|
-          obj = Luna::Binary::Update.new()
-          if args[0] != nil
-            obj.binary_path = args[0]  
-          else
+        else
+          help_now!('args is required') if args.empty?
+          help_now!('workspace is required') if args[0] == nil
+          help_now!('scheme is required') if args[1] == nil
+          build = Luna::Binary::Build.new()
+          build.workspace=args[0]
+          build.scheme=args[1]
+          if build.run
+            obj = Luna::Binary::Refresh.new()
             obj.binary_path = Luna::Binary::Common.instance.binary_path_merged
+            obj.run
           end
-          obj.run
+        end
+
       end
     end
 
@@ -175,14 +146,13 @@ class App
     arg_name '1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject'
     command :build do |c|
       c.action do |global_options,options,args|
-        if args[0] && args[1]
-          obj = Luna::Binary::Build.new()
-          obj.workspace=args[0]
-          obj.scheme=args[1]
-          obj.run
-        else
-         raise "缺少参数：1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject"
-        end
+        help_now!('args is required') if args.empty?
+        help_now!('workspace is required') if args[0] == nil
+        help_now!('scheme is required') if args[1] == nil
+        obj = Luna::Binary::Build.new()
+        obj.workspace=args[0]
+        obj.scheme=args[1]
+        obj.run
       end
     end
 
@@ -190,12 +160,11 @@ class App
     arg_name '1.armPath 2.x86path'
     command :merge do |c|
       c.action do |global_options,options,args|
-        if args[0] &&  args[1]
-          obj = Luna::Binary::Build.new()
-          obj.mergeFrameWorks(args[0], args[1])
-        else
-          raise "缺少参数：1.armPath 2.x86path"
-        end
+        help_now!('args is required') if args.empty?
+        help_now!('armPath is required') if args[0] == nil
+        help_now!('x86path is required') if args[1] == nil
+        obj = Luna::Binary::Build.new()
+        obj.mergeFrameWorks(args[0], args[1])
       end
     end
 
@@ -203,6 +172,9 @@ class App
     arg_name '1.跑工程几次 2.workspace 3.scheme 4.normal正常模式下 binary二进制模式下，不传的话都跑'
     command :benchmark do |c|
       c.action do |global_options,options,args|
+        help_now!('args is required') if args.empty?
+        help_now!('workspace is required') if args[0] == nil
+        help_now!('scheme is required') if args[1] == nil
         obj = Luna::Binary::BenchMark.new(Integer(args[0]), args[1], args[2])
         if args[3] == "normal"
           obj.run_no_binary
@@ -215,6 +187,32 @@ class App
       end
     end
 
+    desc '二进制build完自动将podfile标记的需要二进制的，进行打包上传'
+    arg_name 'workspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject'
+    command :publish do |c|
+      c.desc '是否需要build, 不需要的话 -n or --no'
+      c.switch [:n,:no]
+      c.action do |global_options,options,args|
+        help_now!('args is required') if args.empty?
+        if options[:no]
+          update = Luna::Binary::Update.new()
+          update.binary_path = Luna::Binary::Common.instance.binary_path_merged
+          update.run
+        else
+          help_now!('workspace is required') if args[0] == nil
+          help_now!('scheme is required') if args[1] == nil
+          build = Luna::Binary::Build.new()
+          build.workspace=args[0]
+          build.scheme=args[1]
+          if build.run
+            update = Luna::Binary::Update.new()
+            update.binary_path = Luna::Binary::Common.instance.binary_path_merged
+            update.run
+          end
+        end
+      end
+    end
+
     pre do |global,command,options,args|
       # Pre logic here
       # Return true to proceed; false to abort and not call the

data/lib/luna/binary/build.rb

@@ -16,7 +16,7 @@ module Luna
             end
 
             def run 
-                createFrameworks
+                return createFrameworks
             end
 
             def command(c)
@@ -35,6 +35,7 @@ module Luna
                 isNext = command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug -derivedDataPath '#{tempLunaUploaderPath}/build/x86/temp' -destination 'platform=iOS Simulator,name=iPhone 11'") if isNext == true
                 isNext = command("cp -r #{tempLunaUploaderPath}/build/x86/temp/Build/Products/Debug-iphonesimulator #{binary_path_x86}") if isNext == true
                 mergeFrameWorks(binary_path_arm, binary_path_x86) if isNext == true
+                return isNext
             end
     
             def mergeFrameWorks(binary_path_arm, binary_path_x86)

data/lib/luna/binary/spec/spec_helper.rb

@@ -0,0 +1,100 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

data/lib/luna/binary/spec/test_spec.rb

@@ -0,0 +1,81 @@
+current_dir = File.dirname(__FILE__)
+
+require 'bundler/setup'
+Bundler.require
+require "#{current_dir}/spec_helper.rb"
+require "#{current_dir}/../common/common.rb"
+
+RSpec.describe Commmon do
+  describe 'exception' do
+    it do
+      expect { Common.instance.repoPath }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe 'exist' do
+    it do
+      expect { Common.instance.repoPath.length.empty? }.to be false
+    end
+  end
+
+  describe 'exist lockfile' do
+    it do
+      expect { Common.instance.lockfile.empty? }.to be false
+    end
+  end
+
+
+end
+
+
+RSpec.describe Uploader do
+  describe 'exception' do
+    it do
+      expect { Common.instance.repoPath }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe 'exist' do
+    it do
+      expect { Common.instance.repoPath.length != 0 }.to be true
+    end
+  end
+end
+
+RSpec.describe 'Assertion' do
+  describe 'expect equality' do
+    it do
+      foo = 1
+      expect(foo).to eq(1)
+    end
+
+    it do
+      foo = [1, 2, 3]
+      expect(foo).not_to equal([1, 2, 3])
+    end
+  end
+
+  describe 'expect Truthiness' do
+    it { expect(1 + 1 == 2).to be true }
+  end
+
+  describe 'match array' do
+    it do
+      arr = [1, 2, 3]
+      expect(arr).to match_array([1, 2, 3])
+    end
+  end
+
+  describe 'exception' do
+    it do
+      expect { nil.split(',') }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe 'state change' do
+    it do
+      arr = [1]
+      expect { arr += [2, 3] }.to change { arr.size }.by(2)
+    end
+  end
+end

data/lib/luna/binary/uploader/version.rb

@@ -1,7 +1,7 @@
 module Luna
   module Binary
     module Uploader
-      VERSION = "0.1.24"
+      VERSION = "0.1.25"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - 车德超
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -148,6 +148,8 @@ files:
 - lib/luna/binary/init.rb
 - lib/luna/binary/install.rb
 - lib/luna/binary/refresh.rb
+- lib/luna/binary/spec/spec_helper.rb
+- lib/luna/binary/spec/test_spec.rb
 - lib/luna/binary/update.rb
 - lib/luna/binary/uploader.rb
 - lib/luna/binary/uploader/version.rb
@@ -156,7 +158,7 @@ homepage: https://github.com/YoudaoMobile/luna-binary-uploader
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: 词典上传二进制控件
 test_files: []