asca 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb99fd99b67a5d8440d6aa5cdc76e1a5b2626f1791a552a997e739639c2cef24
-  data.tar.gz: b6f522bd18d8cec13379bbe6cb5dd12eb7bea4d33df66c9536aee2f9c2cf95f0
+  metadata.gz: bc9b810b18682238d1c5f99d0a623e99463e9160adc17d785b9fa63212dd0f0b
+  data.tar.gz: 0d735db64772cde9d62c447fe1e7dd60f7c19b26472b6168d75b5d05992278e7
 SHA512:
-  metadata.gz: 5662fe1aa8eea3b3b60d78f95f4dbe83faf5b514c435c7718da8a7502ff2e9dbd8b739ccd29f611a017cca5495f38c8eedc0cfc14f6408c28b737d8f05b8cb9b
-  data.tar.gz: 811fed53802b08427f50dc1d5b365d403b05afcc5522dc366b3fb3425ebb70abbce13fb0673132dc1cb05af5004d4ee19925524514c21e594e3d4594a80864c5
+  metadata.gz: b7435d44fe5e5f51b17e5694b1e1014079b7261e646bfa4717ebf2db8a695b04151e6bab12030819325fe781b9abe8e4f75676803dca3a2a4d3f6c669a70f826
+  data.tar.gz: 04b5f0cbe2485bf6a3f3b04253c0629ea5e3860efe02de6c1f8614e11d2642b3ed925d0ca7aee8bf642bba4740b1654b5b4f45d92ec8569537e27942b16cacac

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/Gemfile.lock

@@ -2,18 +2,39 @@ PATH
   remote: .
   specs:
     asca (0.1.0)
-      curb
+      http
       json
       jwt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    curb (0.9.10)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.13.1)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    http (4.4.1)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
     json (2.3.1)
     jwt (2.2.2)
     minitest (5.14.1)
+    public_suffix (4.0.5)
     rake (10.5.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,8 @@
 # Asca
 
+[![GitHub license](https://img.shields.io/github/license/xueminghao/appstoreconnectapi)](https://github.com/xueminghao/appstoreconnectapi/blob/master/LICENSE.txt)
+[![npm](https://img.shields.io/npm/v/asca)](https://rubygems.org/gems/asca)
+
 An apple app store connect api wrapper based on ruby!!!
 
 Why ruby?
@@ -8,13 +11,27 @@ Every mac's ready for ruby out of the box!!!
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Install from rubygem.org
 
-```ruby
+``` sh
+gem install asca
+```
+
+Install from github
+
+``` sh
 gem install specific_install
 gem specific_install https://github.com/xueminghao/appstoreconnectapi.git
 ```
 
+## What you need
+
+1. App store connect key id
+1. App store connect issuer ID
+1. App store connect private key
+
+For more details for how and where to get these info, you can refer to the [App Store Connect API](https://developer.apple.com/documentation/appstoreconnectapi/generating_tokens_for_api_requests)
+
 ## Usage
 
 * Download provisioning files by name from developer account

data/asca.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_dependency "json"
-  spec.add_dependency "curb"
+  spec.add_dependency "http"
   spec.add_dependency 'jwt'
 end

data/exe/asca

@@ -12,19 +12,29 @@ options = {}
 option_parser = OptionParser.new do |opts|
   opts.banner = 'This is an apple connect api wrapper cli.'
 
-  opts.on('-a action-name', '--action action-name', 'profile-install, profile-download') do |value|
+  opts.on('-a action-name', '--action action-name', 'version, profile-install, profile-download') do |value|
     options[:action] = value
   end
   opts.on('-n name', '--name name', 'Profile name') do |value|
     options[:profile_name] = value
   end
+  opts.on('-v', '--version', 'Get current version') do |value|
+    options[:action] = 'version'
+  end
 end.parse!
 
 case options[:action]
+when 'version'
+  Asca::Log.info(Asca::VERSION)
 when 'profile-download'
-    Asca::Profiles.download_profile options[:profile_name]
+  Asca::Profiles.download_profile options[:profile_name]
 when 'profile-install'
-    Asca::Profiles.install_profile options[:profile_name]
+  Asca::Profiles.install_profile options[:profile_name]
 else
+  if options[:action]
     puts "Unsupported action: " + options[:action]
+  else
+    puts Asca::Log.error('Wrong parameters')
+  end
+
 end

data/lib/asca.rb

@@ -1,4 +1,5 @@
 require "asca/version"
+require "asca/log.rb"
 require "asca/consts.rb"
 require "asca/configuration.rb"
 require "asca/token"

data/lib/asca/log.rb

@@ -0,0 +1,53 @@
+module Asca
+    class Log
+        class Color
+            class << self
+            def time
+                "\e[37m"
+            end
+
+            def warn
+                "\e[33;1m"
+            end
+
+            def info
+                "\e[32m"
+            end
+
+            def error
+                "\e[31;1m"
+            end
+
+            def reset
+                "\e[0m"
+            end
+
+            def command
+                "\e[34m"
+            end
+            end
+        end
+
+        class << self
+            def warn message
+            puts "#{Color.warn}WARN: #{message}#{Color.reset}"
+            end
+
+            def info message
+            puts "#{Color.info}INFO: #{message}#{Color.reset}"
+            end
+
+            def error message
+            puts "#{Color.error}ERROR: #{message}#{Color.reset}", STDERR
+            end
+
+            def command message
+            puts "#{Color.command}RUN: \e[4m#{message}#{Color.reset}"
+            end
+
+            def puts message, io = STDOUT
+            io.puts "#{Color.time}[#{Time.new}]#{Color.reset} #{message}"
+            end
+        end
+    end
+end

data/lib/asca/profiles.rb

@@ -1,4 +1,4 @@
-require 'curb'
+require 'http'
 require 'json'
 require "base64"
 
@@ -14,13 +14,15 @@ module Asca
               Asca::Configuration.update_config('out_put_dir', out_put_dir)
           end
         end
-        http = Curl.get(URI_PROFILES, { 'filter[name]' => profile_name}) do |http|
-          http.headers['Authorization'] = ' Bearer ' + Asca::Token.new_token
-        end
-        profile_obj = JSON.parse(http.body_str)
-        profile_content = profile_obj["data"][0]["attributes"]['profileContent']
-        File.open(File.expand_path(profile_name + ".mobileprovision", out_put_dir), 'w') do |file|
-          file.write(Base64.decode64(profile_content))
+        response = HTTP.auth('Bearer ' + Asca::Token.new_token).get(URI_PROFILES, :params => { 'filter[name]' => profile_name })
+        if response.status.success?
+          profile_obj = JSON.parse(response.body)
+          profile_content = profile_obj["data"][0]["attributes"]['profileContent']
+          File.open(File.expand_path(profile_name + ".mobileprovision", out_put_dir), 'w') do |file|
+            file.write(Base64.decode64(profile_content))
+          end
+        else
+          Log.error(response.body)
         end
       end
 

data/lib/asca/token.rb

@@ -77,15 +77,15 @@ module Asca
             end
 
             def get_token_from_cache
-                cached_token_time = Asca::Configuration.get_config('cache_token_time')
-                if !cached_token_time
+                token_valid_max_time = Asca::Configuration.get_config('cache_token_time')
+                if !token_valid_max_time
                     return nil
                 end
                 current = Time.now.to_i
-                if cached_token_time - current > EXPIRE_DURATION
-                    return nil
+                if token_valid_max_time > current
+                    return Asca::Configuration.get_config('cache_token')
                 end
-                return Asca::Configuration.get_config('cache_token')
+                return nil
             end
         end
     end

data/lib/asca/version.rb

@@ -1,3 +1,3 @@
 module Asca
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asca
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - xueminghao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,6 +118,7 @@ files:
 - lib/asca.rb
 - lib/asca/configuration.rb
 - lib/asca/consts.rb
+- lib/asca/log.rb
 - lib/asca/profiles.rb
 - lib/asca/token.rb
 - lib/asca/version.rb