tiny_appstore_connect 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0a0ee36290dce8d6fec8d64801bda09fa15e27668d755e058739a1bdc04d79
-  data.tar.gz: 2d5b81ef78cd0c3a004df7e625044f01761582b87f3ce5e244a168cc9b3c6283
+  metadata.gz: 494a8a5e708cbb4977b5a615695320ef043acf68d412478bd8a9d611ca4ff849
+  data.tar.gz: f3305e5be3e62211f6136f2c020d969f5f9961845e760e6aba1aba9d981a33f1
 SHA512:
-  metadata.gz: 614467c40dfdc1e23aebc2fd823a0becb210abc6aaebeaeafea348f98826431f408a2476adfc39ab319f561d779838527ab8c02607fec6c7ba5c30c4dcc774b2
-  data.tar.gz: b8380dfa0bf0e96c580b55cd5651837cf5767f2b28362f2bc554c181d4d0e3860f5be71f5fea8968e9c0b092b733d62ec404538716e17c241df81d2936ade76c
+  metadata.gz: f12fc5faf9af9374bf8466cae721dd18996ab6e0752a55a88562f41063d605600046d11745342e2ccddf0319c50dd75303821935d9f8b80710d43c8b420c163f
+  data.tar.gz: 5003210e7e350583f15d2e021ad0248712abc7645092c91949259a93862be712574cc0ae4984ffda05be075fbe5c36245026303fecd993932d340ac69dd88274

data/.rubocop.yml

@@ -1,13 +1,34 @@
 AllCops:
   TargetRubyVersion: 2.6
+  SuggestExtensions: false
+  NewCops: disable
+  Exclude:
+    - 'bin/*'
+    - 'spec/**/*'
+    - '*.rb'
 
 Style/StringLiterals:
   Enabled: true
-  EnforcedStyle: double_quotes
+  EnforcedStyle: single_quotes
 
 Style/StringLiteralsInInterpolation:
   Enabled: true
-  EnforcedStyle: double_quotes
+  EnforcedStyle: single_quotes
 
 Layout/LineLength:
   Max: 120
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Lint/NonDeterministicRequireOrder:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Layout/TrailingEmptyLines:
+  Enabled: false

data/Gemfile

@@ -9,3 +9,4 @@ gem 'awesome_print', '~> 2.0.0.pre2'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'
 gem 'rubocop', '~> 1.21'
+gem 'keycutter'

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -11,7 +11,6 @@ RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
 
-
 namespace :github do
   task :release do
     Rake::Task['build'].invoke
@@ -22,18 +21,24 @@ namespace :github do
 
   task :push do
     helper = Bundler::GemHelper.new
-    # puts helper.base
-    # puts helper.gemspec
-    puts "#{helper.send(:name)}-*.gem"
-    puts helper.send(:name)
-    puts helper.send(:built_gem_path)
-    puts Gem::Util.glob_files_in_dir("#{helper.send(:name)}-*.gem", helper.base)
-    # puts helper.send(:rubygem_push, helper.send(:built_gem_path))
-    # helper.send(:rubygem_push, '.')
-    # cmd = [*gem_command, "push", path]
-    #   cmd << "--key" << gem_key if gem_key
-    #   cmd << "--host" << allowed_push_host if allowed_push_host
-
-    # Bundler.ui.debug(cmd)
+    gem_base = helper.base
+    gem_name = helper.send(:name)
+    gem_version = helper.send(:version)
+    gem_key = 'github'
+    allowed_push_host = 'https://rubygems.pkg.github.com/icyleaf'
+
+    gem_file = Gem::Util.glob_files_in_dir("#{gem_name}-*.gem", File.join(gem_base, 'pkg'))
+                        .max_by { |f| File.mtime(f) }
+
+    cmd = ['gem', 'push', gem_file]
+    cmd << '--key' << gem_key
+    cmd << '--host' << allowed_push_host
+
+    Bundler.ui.debug(cmd)
+    Bundler::SharedHelpers.chdir(gem_base) do
+      abort unless Kernel.system(*cmd)
+    end
+
+    Bundler.ui.confirm "Pushed #{gem_name} #{gem_version} to #{gem_file}"
   end
 end

data/lib/tiny_appstore_connect/client.rb

@@ -4,20 +4,24 @@
 # License by fastlane team (https://github.com/fastlane/fastlane)
 
 require 'faraday'
-if Gem::Dependency.new('', '< 2.0.0').match?('', Faraday::VERSION)
-  require 'faraday_middleware'
-end
+require 'faraday_middleware' if Gem::Dependency.new('', '< 2.0.0').match?('', Faraday::VERSION)
+require 'tiny_appstore_connect/clients/app_store_version'
+require 'tiny_appstore_connect/clients/app'
+require 'tiny_appstore_connect/clients/build'
+require 'tiny_appstore_connect/clients/device'
+require 'tiny_appstore_connect/clients/certificate'
+require 'tiny_appstore_connect/clients/user'
 
 module TinyAppstoreConnect
   class Client
-    Dir[File.expand_path('clients/*.rb', __dir__)].each { |f| require f }
-
     ENDPOINT = 'https://api.appstoreconnect.apple.com/v1'
 
     include App
     include AppStoreVersion
     include Build
     include Device
+    include Certificate
+    include User
 
     attr_reader :connection
 
@@ -43,7 +47,6 @@ module TinyAppstoreConnect
     private
 
     def validates(response)
-      puts response.body
       case response.status
       when 200, 201, 204
         # 200: get requests
@@ -67,29 +70,39 @@ module TinyAppstoreConnect
     end
 
     def configure_connection(**kargs)
-      @token = Token.new(**kargs)
       endpoint = kargs[:endpoint] || ENDPOINT
+      options = connection_options(**kargs)
 
-      connection_opts= {
+      @connection = Faraday.new(endpoint, options) do |builder|
+        configure_builder_common(builder, **kargs)
+        configure_builder_debug(builder, **kargs)
+      end
+    end
+
+    def connection_options(**kargs)
+      {
         request: {
-          timeout:       (kargs[:timeout] || 300).to_i,
-          open_timeout:  (kargs[:timeout] || 300).to_i
+          timeout: (kargs[:timeout] || 300).to_i,
+          open_timeout: (kargs[:timeout] || 300).to_i
         }
       }
+    end
 
-      @connection = Faraday.new(endpoint) do |builder|
-        builder.headers[:user_agent] = "TinyAppstoreConnect v#{TinyAppstoreConnect::VERSION}"
-        builder.headers[:accept] = 'application/json'
-        builder.request :url_encoded
-        builder.request :authorization, 'Bearer', -> { @token.token }
-        builder.response :json, content_type: /\bjson$/
-
-        if kargs[:debug] || ENV['ASC_DEBUG']
-          builder.proxy = kargs[:proxy] || ENV['ASC_PROXY'] ||'https://127.0.0.1:8888'
-          builder.ssl[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
-          builder.response :logger, nil, { log_level: :debug }
-        end
-      end
+    def configure_builder_common(builder, **kargs)
+      @token = Token.new(**kargs)
+
+      builder.headers[:user_agent] = "TinyAppstoreConnect v#{TinyAppstoreConnect::VERSION}"
+      builder.request :url_encoded
+      builder.request :authorization, 'Bearer', -> { @token.token }
+      builder.response :json, content_type: /\bjson$/
+    end
+
+    def configure_builder_debug(builder, **kargs)
+      return unless kargs[:debug] || ENV['ASC_DEBUG']
+
+      builder.proxy = kargs[:proxy] || ENV['ASC_PROXY'] || 'https://127.0.0.1:8888'
+      builder.ssl[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
+      builder.response :logger, nil, { log_level: :debug }
     end
   end
 end

data/lib/tiny_appstore_connect/clients/app.rb

@@ -5,38 +5,38 @@
 
 class TinyAppstoreConnect::Client
   module App
-    def apps(query = {})
-      get('apps', query)
+    def apps(**query)
+      get('apps', **query)
     end
 
-    def app(id, query = {})
-      get("apps/#{id}", query).to_model
+    def app(id, **query)
+      get("apps/#{id}", **query).to_model
     end
 
-    def app_versions(id, query = {})
-      get("apps/#{id}/appStoreVersions", query)
+    def app_versions(id, **query)
+      get("apps/#{id}/appStoreVersions", **query)
     end
 
-    def app_edit_version(id, includes: AppStoreVersion::ESSENTIAL_INCLUDES)
+    def app_edit_version(id, includes: TinyAppstoreConnect::Model::AppStoreVersion::ESSENTIAL_INCLUDES)
       filters = {
         appStoreState: [
-          AppStoreState::PREPARE_FOR_SUBMISSION,
-          AppStoreState::DEVELOPER_REJECTED,
-          AppStoreState::REJECTED,
-          AppStoreState::METADATA_REJECTED,
-          AppStoreState::WAITING_FOR_REVIEW,
-          AppStoreState::INVALID_BINARY,
-          AppStoreState::IN_REVIEW,
-          AppStoreState::PENDING_DEVELOPER_RELEASE
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::PREPARE_FOR_SUBMISSION,
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::DEVELOPER_REJECTED,
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::REJECTED,
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::METADATA_REJECTED,
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW,
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::INVALID_BINARY,
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::IN_REVIEW,
+          TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE
         ].join(',')
       }
 
       app_versions(id, include: includes, filter: filters).to_model
     end
 
-    def app_live_version(id, includes: ESSENTIAL_INCLUDES)
+    def app_live_version(id, includes: TinyAppstoreConnect::Model::AppStoreVersion::ESSENTIAL_INCLUDES)
       filters = {
-        appStoreState: AppStoreState::READY_FOR_SALE
+        appStoreState: TinyAppstoreConnect::Model::AppStoreVersion::AppStoreState::READY_FOR_SALE
       }
 
       app_versions(id, include: includes, filter: filters).to_model

data/lib/tiny_appstore_connect/clients/app_store_version.rb

@@ -9,8 +9,8 @@ class TinyAppstoreConnect::Client
     #   get('appStoreVersions', query)
     # end
 
-    def version(id, query = {})
-      get("appStoreVersions/#{id}", query)
+    def version(id, **query)
+      get("appStoreVersions/#{id}", **query)
     end
 
     def select_version_build(id, build_id:)

data/lib/tiny_appstore_connect/clients/build.rb

@@ -9,20 +9,20 @@ class TinyAppstoreConnect::Client
       app_builds(id, limit: 1).to_model
     end
 
-    def app_builds(id, **kargs)
-      kargs = kargs.merge(filter: { app: id })
-      builds(**kargs)
+    def app_builds(id, **query)
+      query = query.merge(filter: { app: id })
+      builds(**query)
     end
 
     def builds(limit: 200, sort: '-uploadedDate',
       includes: TinyAppstoreConnect::Model::Build::ESSENTIAL_INCLUDES,
-                **kargs)
+                **query)
 
-      kargs = kargs.merge(limit: limit)
+      query = query.merge(limit: limit)
         .merge(sort: sort)
         .merge(include: includes)
 
-      get('builds', **kargs)
+      get('builds', **query)
     end
   end
 end

data/lib/tiny_appstore_connect/clients/certificate.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Inspried from fastlane/spaceship
+# License by fastlane team (https://github.com/fastlane/fastlane)
+
+class TinyAppstoreConnect::Client
+  module Certificate
+    def certificates(**query)
+      get('certificates', **query)
+    end
+
+    def certificate(id, **query)
+      get("certificates/#{id}", **query).to_model
+    end
+
+    def distribution_certificates(**query)
+      query[:filter] = {
+        certificateType: TinyAppstoreConnect::Model::Certificate::CertificateType::DISTRIBUTION,
+      }
+
+      certificates(**query)
+    end
+  end
+end

data/lib/tiny_appstore_connect/clients/device.rb

@@ -6,13 +6,13 @@
 class TinyAppstoreConnect::Client
   module Device
     def devices(filter: {}, includes: nil, limit: nil, sort: nil)
-      kargs = {
+      query = {
         include: includes,
         limit: limit,
         sort: sort
       }.delete_if { |_, v| v.nil? }
 
-      get('devices', **kargs)
+      get('devices', **query)
     end
   end
 end

data/lib/tiny_appstore_connect/clients/user.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Inspried from fastlane/spaceship
+# License by fastlane team (https://github.com/fastlane/fastlane)
+
+class TinyAppstoreConnect::Client
+  module User
+    def users(**query)
+      get('users', **query)
+    end
+
+    def user(id, **query)
+      get("users/#{id}", **query).to_model
+    end
+  end
+end

data/lib/tiny_appstore_connect/model.rb

@@ -167,3 +167,5 @@ require_relative 'models/build'
 require_relative 'models/pre_release_version'
 require_relative 'models/app_store_version_submission'
 require_relative 'models/device'
+require_relative 'models/certificate'
+require_relative 'models/user'

data/lib/tiny_appstore_connect/models/certificate.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Inspried from fastlane/spaceship
+# License by fastlane team (https://github.com/fastlane/fastlane)
+
+module TinyAppstoreConnect::Model
+  class Certificate
+    include TinyAppstoreConnect::Model
+
+    attr_accessor :name
+    attr_accessor :certificate_type
+    attr_accessor :display_name
+    attr_accessor :serial_number
+    attr_accessor :platform
+    attr_accessor :expiratio_date
+    attr_accessor :certificate_content
+
+    module CertificateType
+      DISTRIBUTION = 'DISTRIBUTION'
+      DEVELOPMENT = 'DEVELOPMENT'
+
+      IOS_DEVELOPMENT = 'IOS_DEVELOPMENT'
+      IOS_DISTRIBUTION = 'IOS_DISTRIBUTION'
+      MAC_APP_DISTRIBUTION = 'MAC_APP_DISTRIBUTION'
+      MAC_INSTALLER_DISTRIBUTION = 'MAC_INSTALLER_DISTRIBUTION'
+      MAC_APP_DEVELOPMENT = 'MAC_APP_DEVELOPMENT'
+      DEVELOPER_ID_KEXT = 'DEVELOPER_ID_KEXT'
+      DEVELOPER_ID_APPLICATION = 'DEVELOPER_ID_APPLICATION'
+      PASS_TYPE_ID = 'PASS_TYPE_ID'
+      PASS_TYPE_ID_WITH_NFC = 'PASS_TYPE_ID_WITH_NFC'
+    end
+
+    def team_id
+      certificate.subject
+                 .to_a
+                 .find {|n, _, _| n == 'OU'}[1]
+                 .force_encoding('UTF-8')
+    end
+
+    def certificate
+      require 'openssl'
+
+      data = [
+        '-----BEGIN CERTIFICATE-----',
+        certificate_content,
+        '-----END CERTIFICATE-----'
+      ].join("\n")
+
+      OpenSSL::X509::Certificate.new(data)
+    end
+
+    def self.type
+      'certificates'
+    end
+  end
+end

data/lib/tiny_appstore_connect/models/pre_release_version.rb

@@ -4,7 +4,7 @@
 # License by fastlane team (https://github.com/fastlane/fastlane)
 
 module TinyAppstoreConnect::Model
-  class PreReleaseVersion
+  class UserRole
     include TinyAppstoreConnect::Model
 
     attr_accessor :version

data/lib/tiny_appstore_connect/models/user.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# Inspried from fastlane/spaceship
+# License by fastlane team (https://github.com/fastlane/fastlane)
+
+module TinyAppstoreConnect::Model
+  class User
+    include TinyAppstoreConnect::Model
+
+    attr_accessor :username
+    attr_accessor :first_name
+    attr_accessor :last_name
+    attr_accessor :roles
+    attr_accessor :all_apps_visible
+    attr_accessor :provisioning_allowed
+
+    module UserRole
+      ADMIN = 'ADMIN'
+      FINANCE = 'FINANCE'
+      ACCOUNT_HOLDER = 'ACCOUNT_HOLDER'
+      SALES = 'SALES'
+      MARKETING = 'MARKETING'
+      APP_MANAGER = 'APP_MANAGER'
+      DEVELOPER = 'DEVELOPER'
+      ACCESS_TO_REPORTS = 'ACCESS_TO_REPORTS'
+      CUSTOMER_SUPPORT = 'CUSTOMER_SUPPORT'
+      IMAGE_MANAGER = 'IMAGE_MANAGER'
+      CREATE_APPS = 'CREATE_APPS'
+      CLOUD_MANAGED_DEVELOPER_ID = 'CLOUD_MANAGED_DEVELOPER_ID'
+      CLOUD_MANAGED_APP_DISTRIBUTION = 'CLOUD_MANAGED_APP_DISTRIBUTION'
+    end
+
+    def self.type
+      'users'
+    end
+  end
+end

data/lib/tiny_appstore_connect/response.rb

@@ -7,7 +7,7 @@ require 'forwardable'
 
 module TinyAppstoreConnect
   class Response
-    include Enumerable
+    # include Enumerable
     extend Forwardable
 
     attr_reader :response, :connection
@@ -95,7 +95,7 @@ module TinyAppstoreConnect
 
     def each(&block)
       to_models.each do |model|
-        yield(model)
+        block.call(model)
       end
     end
   end

data/lib/tiny_appstore_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TinyAppstoreConnect
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/tiny_appstore_connect.rb

@@ -12,26 +12,7 @@ module TinyAppstoreConnect
   class ConnectAPIError < Error
     class << self
       def parse(response)
-        errors = response.body['errors']
-        case response.status
-        when 401
-          # Unauthorized
-          InvalidUserCredentialsError.from_errors(errors)
-        when 403
-          # The API key in use does not allow this request
-          ForbiddenError.from_errors(errors)
-        when 404
-          # Not found resource
-          NotFoundError.from_errors(errors)
-        when 409
-          # Invaild request entity
-          InvalidEntityError.from_errors(errors)
-        when 429
-          # 429 Rate Limit Exceeded
-          RateLimitExceededError.from_errors(errors)
-        else
-          ConnectAPIError.from_errors(errors)
-        end
+        handel_error(response.status, response.body['errors'])
       end
 
       def from_errors(errors)
@@ -42,6 +23,24 @@ module TinyAppstoreConnect
 
         new(message)
       end
+
+      private
+
+      def handel_error(status_code, errors)
+        case status_code
+        # Unauthorized
+        when 401 then InvalidUserCredentialsError.from_errors(errors)
+        # The API key in use does not allow this request
+        when 403 then ForbiddenError.from_errors(errors)
+        # Not found resource
+        when 404 then NotFoundError.from_errors(errors)
+        # Invaild request entity
+        when 409 then InvalidEntityError.from_errors(errors)
+        # 429 Rate Limit Exceeded
+        when 429 then RateLimitExceededError.from_errors(errors)
+        else ConnectAPIError.from_errors(errors)
+        end
+      end
     end
   end
 

data/tiny_appstore_connect.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['github_repo'] = 'ssh://github.com/icyleaf/tiny_appstore_connect'
 
-
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
       (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
@@ -29,4 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday', '>= 1.10.0', '< 3.0'
   spec.add_dependency 'jwt', '>= 1.4', '<= 2.2.1'
+  spec.add_dependency 'openssl', '>= 3.0.0', '< 4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_appstore_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -50,6 +50,26 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Tiny AppStore Connect API
 email:
 - icyleaf.cn@gmail.com
@@ -69,14 +89,18 @@ files:
 - lib/tiny_appstore_connect/clients/app.rb
 - lib/tiny_appstore_connect/clients/app_store_version.rb
 - lib/tiny_appstore_connect/clients/build.rb
+- lib/tiny_appstore_connect/clients/certificate.rb
 - lib/tiny_appstore_connect/clients/device.rb
+- lib/tiny_appstore_connect/clients/user.rb
 - lib/tiny_appstore_connect/model.rb
 - lib/tiny_appstore_connect/models/app.rb
 - lib/tiny_appstore_connect/models/app_store_version.rb
 - lib/tiny_appstore_connect/models/app_store_version_submission.rb
 - lib/tiny_appstore_connect/models/build.rb
+- lib/tiny_appstore_connect/models/certificate.rb
 - lib/tiny_appstore_connect/models/device.rb
 - lib/tiny_appstore_connect/models/pre_release_version.rb
+- lib/tiny_appstore_connect/models/user.rb
 - lib/tiny_appstore_connect/response.rb
 - lib/tiny_appstore_connect/token.rb
 - lib/tiny_appstore_connect/version.rb