codes 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34b56b7948df3498826c2deed30e0b559ee3b0ae
-  data.tar.gz: 8c1e4e68aaaae4125efefcc4a7e57e88927ec011
+  metadata.gz: 5de44a06df82ccf5f52fb7012beb8fbb45ea091f
+  data.tar.gz: 3815b7cafc3affe3801c642b72227326d6d89af9
 SHA512:
-  metadata.gz: aa064ec5e1229d765f377227dd26f138e89e8fdcf8a48ebae235dbec31a4eb19e0ae65a9034097dfe9d347ffd56c4cd5793355e0b35831c76257cb75369e3f8b
-  data.tar.gz: 45e3a769ce73b7ac8fa38e18fa2853d39fd77b10fe42102debb1790e76b12bbca30ee31285085e58634deffc45613906565e565fe68226b09fe8862a1f9d36ff
+  metadata.gz: 12a724b931a13c7d6a04a4f5fa6370fd6bd5a2d67d252e4bad9619b0e68aa36c3929bac652267577f70c94706ec43e8360f6ff6361f58737e24d03a48df585c4
+  data.tar.gz: 22e7597ee1a3f194f4e4943432f682e0022aa956344fc25196863d685dd3de8bd8cdd0a270cbb397cc55b7ffc86b76870b6678ff2933de427fd36119cdff7bb9

data/bin/codes

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.push File.expand_path("../../lib", __FILE__)
+$:.push File.expand_path('../../lib', __FILE__)
 
 require 'codes'
 require 'commander'
@@ -17,6 +17,43 @@ class CodesApplication
   end
 
   def run
+    prepare_command
+
+    command :download do |c|
+      c.syntax = 'codes download [num]'
+      c.description = 'Download [num] new promo codes from iTunes Connect'
+
+      c.action do |args, options|
+        username options
+        number_of_codes = count(args)
+        apple_id = apple_id(options)
+        app_identifier = bundle_id(options, apple_id)
+        format = download_format options
+
+        Codes::CodesRunner.download(number_of_codes: number_of_codes, app_identifier: app_identifier, apple_id: apple_id, output_file_path: options.output_file, format: format, country: options.country)
+      end
+    end
+
+    command :display do |c|
+      c.syntax = 'codes display'
+      c.description = 'Display remaining number of promo codes from iTunes Connect'
+
+      c.action do |args, options|
+        username options
+        apple_id = apple_id(options)
+        app_identifier = bundle_id(options, apple_id)
+
+        Codes::CodesRunner.display(app_identifier: app_identifier, apple_id: apple_id, output_file_path: options.output_file, country: options.country)
+      end
+    end
+    default_command :download
+
+    run!
+  end
+
+  private
+
+  def prepare_command
     program :version, Codes::VERSION
     program :description, 'CLI for \'codes\' - Create promo codes for iOS Apps using the command line'
     program :help, 'Author', 'Felix Krause <codes@krausefx.com>'
@@ -34,85 +71,48 @@ class CodesApplication
     global_option '-f', '--format STRING', 'If specified, modifies the format of the output to the specified format'
     global_option '-X', '--verbose', "If specified, defines the default output. Similar to -f \'#{download_verbose_format}\'"
     global_option '-x', '--urls', 'If specified, includes a full URL for each code that can be used to redeem that code.'
+  end
 
+  def count(args)
+    [args[0].to_i, 1].max # minimum of 1 code
+  end
 
-    command :download do |c|
-      c.syntax = "codes download [num]"
-      c.description = "Download [num] new promo codes from iTunes Connect"
-
-      c.action do |args, options|
-          user = username options
-          number_of_codes = count(args)
-          apple_id = apple_id(options)
-          app_identifier = bundle_id(options, apple_id)
-          format = download_format options
-
-          Codes::CodesRunner.download(number_of_codes: number_of_codes, app_identifier: app_identifier, apple_id: apple_id, output_file_path: options.output_file, format: format, country: options.country)
-      end
-    end
-
-    command :display do |c|
-      c.syntax = "codes display"
-      c.description = "Display remaining number of promo codes from iTunes Connect"
-
-      c.action do |args, options|
-          user = username options
-          apple_id = apple_id(options)
-          app_identifier = bundle_id(options, apple_id)
-
-          Codes::CodesRunner.display(app_identifier: app_identifier, apple_id: apple_id, output_file_path: options.output_file, country: options.country)
-      end
-    end
-    default_command :download
-
-    def count(args)
-      [args[0].to_i, 1].max # minimum of 1 code
-    end
-
-    def username(options)
-      user = options.username
-      user ||= ENV["CODES_USERNAME"]
-      user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
-
-      
-      CredentialsManager::PasswordManager.shared_manager(user) if user
+  def username(options)
+    user = options.username
+    user ||= ENV['CODES_USERNAME']
+    user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
 
-      user
-    end
+    CredentialsManager::PasswordManager.shared_manager(user) if user
 
-    def download_format(options)
-      verbose = options.X || options.verbose
-      urls = options.x || options.urls
-      format = options.f || options.format
-      # backward compatibility...
-      if urls && !format
-        format = "%c - %u"
-      end
-      if verbose && !format
-        format = download_verbose_format
-      end
-      format
-    end
+    user
+  end
 
-    def bundle_id(options, apple_id)
-      app_identifier = options.app_identifier
-      app_identifier ||= ENV["CODES_APP_IDENTIFIER"]
-      app_identifier ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
-      app_identifier ||= (FastlaneCore::ItunesSearchApi.fetch(apple_id)['bundleId'] rescue nil) if apple_id
-      app_identifier ||= ask("App Identifier (Bundle ID, e.g. com.krausefx.app): ")
-      app_identifier
-    end
+  def download_format(options)
+    verbose = options.X || options.verbose
+    urls = options.x || options.urls
+    format = options.f || options.format
+    # backward compatibility...
+    format = '%c - %u' if urls && !format
+    format = download_verbose_format if verbose && !format
+    format
+  end
 
-    def apple_id(options)
-      apple_id = options.apple_id
-      apple_id ||= ENV["CODES_APP_ID"]
-    end
+  def bundle_id(options, apple_id)
+    app_identifier = options.app_identifier
+    app_identifier ||= ENV['CODES_APP_IDENTIFIER']
+    app_identifier ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
+    app_identifier ||= (FastlaneCore::ItunesSearchApi.fetch(apple_id)['bundleId'] rescue nil) if apple_id
+    app_identifier ||= ask('App Identifier (Bundle ID, e.g. com.krausefx.app): ')
+    app_identifier
+  end
 
-    run!
+  def apple_id(options)
+    apple_id = options.apple_id
+    apple_id ||= ENV['CODES_APP_ID']
+    apple_id
   end
 end
 
-
 begin
   FastlaneCore::UpdateChecker.start_looking_for_update('codes')
   CodesApplication.new.run

data/lib/codes.rb

@@ -6,7 +6,7 @@ require 'codes/itunes_connect'
 require 'fastlane_core'
 
 module Codes
-  Helper = FastlaneCore::Helper 
+  Helper = FastlaneCore::Helper
 
   DependencyChecker.check_dependencies
 end

data/lib/codes/codes_runner.rb

@@ -3,6 +3,7 @@ module Codes
     def self.download(args)
       Codes::ItunesConnect.new.download args
     end
+
     def self.display(args)
       Codes::ItunesConnect.new.display args
     end

data/lib/codes/itunes_connect.rb

@@ -2,30 +2,30 @@ require 'fastlane_core/itunes_connect/itunes_connect'
 
 module Codes
   class ItunesConnect < FastlaneCore::ItunesConnect
+    PROMO_URL = 'https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/wa/LCAppPage/viewPromoCodes?adamId=[[app_id]]&platform=[[platform]]'
+    CODE_URL = 'https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/redeemLandingPage?code=[[code]]'
 
-    PROMO_URL = "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/wa/LCAppPage/viewPromoCodes?adamId=[[app_id]]&platform=[[platform]]"
-    CODE_URL = "https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/redeemLandingPage?code=[[code]]"
-
+    # rubocop:disable Metrics/AbcSize
     def download(args)
       number_of_codes = args[:number_of_codes]
 
-      code_or_codes = number_of_codes == 1 ? "code" : "codes"
-      Helper.log.info "Downloading #{number_of_codes} promo #{code_or_codes}..." 
+      code_or_codes = number_of_codes == 1 ? 'code' : 'codes'
+      Helper.log.info "Downloading #{number_of_codes} promo #{code_or_codes}..."
 
       fetch_app_data args
 
       # Use Pathname because it correctly handles the distinction between relative paths vs. absolute paths
       output_file_path = Pathname.new(args[:output_file_path]) if args[:output_file_path]
       output_file_path ||= Pathname.new(File.join(Dir.getwd, "#{@app_identifier || @app_id}_codes.txt"))
-      raise "Insufficient permissions to write to output file".red if File.exists?(output_file_path) and not File.writable?(output_file_path)
-      visit PROMO_URL.gsub("[[app_id]]", @app_id.to_s).gsub("[[platform]]", @platform)
+      fail 'Insufficient permissions to write to output file'.red if File.exist?(output_file_path) && !File.writable?(output_file_path)
+      visit PROMO_URL.gsub('[[app_id]]', @app_id.to_s).gsub('[[platform]]', @platform)
 
       begin
-        text_fields = wait_for_elements("input[type=text]")
+        text_fields = wait_for_elements('input[type=text]')
       rescue
         raise "Could not open details page for app #{@app_identifier}. Are you sure you are using the correct apple account and have access to this app?".red
       end
-      raise "There should only be a single text input field to specify the number of codes".red unless text_fields.count == 1
+      fail 'There should only be a single text input field to specify the number of codes'.red unless text_fields.count == 1
 
       text_fields.first.set(number_of_codes.to_s)
       click_next
@@ -33,83 +33,84 @@ module Codes
       # are there any errors ?
       errors = []
       begin
-         errors = wait_for_elements("div[id=LCPurpleSoftwarePageWrapperErrorMessage]")
-      rescue Exception
+        errors = wait_for_elements('div[id=LCPurpleSoftwarePageWrapperErrorMessage]')
+      rescue
       end
-      raise errors.first.text.red unless errors.count == 0
+      fail errors.first.text.red unless errors.count == 0
 
-      Helper.log.debug "Accepting the App Store Volume Custom Code Agreement"
-      wait_for_elements("input[type=checkbox]").first.click
+      Helper.log.debug 'Accepting the App Store Volume Custom Code Agreement'
+      wait_for_elements('input[type=checkbox]').first.click
       click_next
 
       # the find(:xpath, "..") gets the parent element of the previous expression
       download_url = wait_for_elements("div[class='large-blue-rect-button']").first.find(:xpath, '..')['href']
 
       codes, request_date = download_codes(download_url)
-      
+
       format = args[:format]
       codes = download_format(codes, format, request_date, app) if format
 
-      bytes_written = File.write(output_file_path.to_s, codes, mode: "a+")
-      Helper.log.warn "Could not write your codes to the codes.txt file, but you can still access them from iTunes Connect later" if bytes_written == 0
-      Helper.log.info "Added generated codes to '#{output_file_path.to_s}'".green unless  bytes_written == 0
+      bytes_written = File.write(output_file_path.to_s, codes, mode: 'a+')
+      Helper.log.warn 'Could not write your codes to the codes.txt file, but you can still access them from iTunes Connect later' if bytes_written == 0
+      Helper.log.info "Added generated codes to '#{output_file_path}'".green unless  bytes_written == 0
 
       Helper.log.info "Your codes (requested #{request_date}) were successfully downloaded:".green
       puts codes
     end
+    # rubocop:enable Metrics/AbcSize
 
     def download_format(codes, format, request_date, app)
-        format = format.gsub(/%([a-z])/, "%{\\1}") # %c => %{c}
-
-        codes = codes.split("\n").map do |code|
-            format % {
-              c: code,
-              b: app['bundleId'],
-              d: request_date, # e.g. 20150520110716 / Cupertino timestamp...
-              i: app['trackId'],
-              n: "\'#{app['trackName']}\'",
-              p: app_platform(app),
-              u: CODE_URL.gsub("[[code]]", code)
-            }
-        end
-        codes = codes.join("\n") + "\n"
+      format = format.gsub(/%([a-z])/, '%{\\1}') # %c => %{c}
+
+      codes = codes.split("\n").map do |code|
+        format % {
+          c: code,
+          b: app['bundleId'],
+          d: request_date, # e.g. 20150520110716 / Cupertino timestamp...
+          i: app['trackId'],
+          n: "\'#{app['trackName']}\'",
+          p: app_platform(app),
+          u: CODE_URL.gsub('[[code]]', code)
+        }
+      end
+      codes.join("\n") + "\n"
     end
 
     def app_platform(app)
-      app['kind'] == "mac-software" ? "osx" : "ios"
+      app['kind'] == 'mac-software' ? 'osx' : 'ios'
     end
 
     def display(args)
-      Helper.log.info "Displaying remaining number of codes promo"
+      Helper.log.info 'Displaying remaining number of codes promo'
 
       fetch_app_data args
 
       # Use Pathname because it correctly handles the distinction between relative paths vs. absolute paths
       output_file_path = Pathname.new(args[:output_file_path]) if args[:output_file_path]
       output_file_path ||= Pathname.new(File.join(Dir.getwd, "#{@app_identifier || @app_id}_codes_info.txt"))
-      raise "Insufficient permissions to write to output file".red if File.exists?(output_file_path) and not File.writable?(output_file_path)
-      visit PROMO_URL.gsub("[[app_id]]", @app_id.to_s).gsub("[[platform]]", @platform)
+      fail 'Insufficient permissions to write to output file'.red if File.exist?(output_file_path) && !File.writable?(output_file_path)
+      visit PROMO_URL.gsub('[[app_id]]', @app_id.to_s).gsub('[[platform]]', @platform)
 
       begin
-        text_fields = wait_for_elements("input[type=text]")
+        text_fields = wait_for_elements('input[type=text]')
       rescue
         raise "Could not open details page for app #{app_identifier}. Are you sure you are using the correct apple account and have access to this app?".red
       end
-      raise "There should only be a single text input field to specify the number of codes".red unless text_fields.count == 1
+      fail 'There should only be a single text input field to specify the number of codes'.red unless text_fields.count == 1
 
-      remaining_divs = wait_for_elements("div#codes_0")
-      raise "There should only be a single text div containing the number of remaining codes".red unless remaining_divs.count == 1
-      remaining = remaining_divs.first.text.split(" ")[0]
+      remaining_divs = wait_for_elements('div#codes_0')
+      fail 'There should only be a single text div containing the number of remaining codes'.red unless remaining_divs.count == 1
+      remaining = remaining_divs.first.text.split(' ')[0]
 
-      bytes_written = File.write(output_file_path.to_s, remaining, mode: "a+")
-      Helper.log.warn "Could not write your codes to the codes_info.txt file, but you can still access them from iTunes Connect later" if bytes_written == 0
-      Helper.log.info "Added information of quantity of remaining codes to '#{output_file_path.to_s}'".green unless  bytes_written == 0
+      bytes_written = File.write(output_file_path.to_s, remaining, mode: 'a+')
+      Helper.log.warn 'Could not write your codes to the codes_info.txt file, but you can still access them from iTunes Connect later' if bytes_written == 0
+      Helper.log.info "Added information of quantity of remaining codes to '#{output_file_path}'".green unless bytes_written == 0
 
       puts remaining
     end
 
     def click_next
-      wait_for_elements("input.continueActionButton").first.click
+      wait_for_elements('input.continueActionButton').first.click
     end
 
     def download_codes(url)
@@ -117,16 +118,16 @@ module Codes
       url = URI.join(host, url)
       Helper.log.debug "Downloading promo code file from #{url}"
 
-      cookie_string = ""
+      cookie_string = ''
       page.driver.cookies.each do |key, cookie|
         cookie_string << "#{cookie.name}=#{cookie.value};"
       end
 
-      page = open(url, "Cookie" => cookie_string)
-      request_date = page.metas['content-disposition'][0].gsub(/.*filename=.*_(.*).txt/,"\\1")
+      page = open(url, 'Cookie' => cookie_string)
+      request_date = page.metas['content-disposition'][0].gsub(/.*filename=.*_(.*).txt/, '\\1')
       codes = page.read
 
-      return codes, request_date
+      [codes, request_date]
     end
 
     private
@@ -138,8 +139,8 @@ module Codes
       @app_id = args[:apple_id]
       @app_id ||= (FastlaneCore::ItunesSearchApi.fetch_by_identifier(@app_identifier, @country)['trackId'] rescue nil)
 
-      if @app_id.to_i == 0 or @app_identifier.to_s.length == 0
-        raise "Could not find app using the following information: #{args}. Maybe the app is not in the store. Pass the Apple ID of the app as well!".red
+      if @app_id.to_i == 0 || @app_identifier.to_s.length == 0
+        fail "Could not find app using the following information: #{args}. Maybe the app is not in the store. Pass the Apple ID of the app as well!".red
       end
 
       app = FastlaneCore::ItunesSearchApi.fetch(@app_id, @country)

data/lib/codes/version.rb

@@ -1,3 +1,3 @@
 module Codes
-  VERSION = "0.4.0"
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Create promo codes for iOS Apps using the command line