codes 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344a3981e1ce1283a03aff8765eee7bdd693d9c9
-  data.tar.gz: e2a579552a9263931bffecd487d84c20306a8c81
+  metadata.gz: 34b56b7948df3498826c2deed30e0b559ee3b0ae
+  data.tar.gz: 8c1e4e68aaaae4125efefcc4a7e57e88927ec011
 SHA512:
-  metadata.gz: 1b6877cc4bd78af8094c5e72c66f299c711e275f6f0e6fb476d1d2c7c81d660dcbe749374a4b824261a1a0a4359c00e7d122893e339252d4e4157fef3c66dd29
-  data.tar.gz: fd65d6ff3df01fc1db381c417b1554605bda178c96be77025470131f02875dc3fc94630108e6895a9e46ff2f9fd0fba32817c5ebb2f55f8db501308a7b45800b
+  metadata.gz: aa064ec5e1229d765f377227dd26f138e89e8fdcf8a48ebae235dbec31a4eb19e0ae65a9034097dfe9d347ffd56c4cd5793355e0b35831c76257cb75369e3f8b
+  data.tar.gz: 45e3a769ce73b7ac8fa38e18fa2853d39fd77b10fe42102debb1790e76b12bbca30ee31285085e58634deffc45613906565e565fe68226b09fe8862a1f9d36ff

data/README.md

@@ -70,7 +70,7 @@ Make sure, you have the latest version of the Xcode command line tools installed
 
 # Usage
 
-    codes [num] [-a app_identifier] [-u user_name] [-i app_id] [-o output_file]
+    codes [num] [-a app_identifier] [-u user_name] [-i app_id] [-o output_file] [-c country] [-X] [-f format]
 
 All parameters are optional.
 
@@ -84,6 +84,24 @@ Will generate 3 promo codes for the the App with the Bundle Identifier `com.exam
 
 If you don't pass any paramaters, `codes` will generate a single promo code and print it on the command line.
 
+## Display extra information
+
+Use the ```--format FORMAT``` argument to control the displayed information. The ```--verbose``` argument displays all information and maps to
+
+    --format '%c,%d,%p,%i,%b,%n,%u'
+
+E.g.
+
+    codes --verbose
+
+will display
+
+    NRTFXP3XXXXX,20150520110716,ios,522069155,com.wewanttoknow.DragonBoxPlus,'DragonBox Algebra 5+',https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/redeemLandingPage?code=NRTFXP3XXXXX
+
+For example, if you want a custom URL, you could use something like
+
+    codes --format '%c: http://yoursite.com/redeem/%c'
+
 ## Generate URLs
 
     codes 5 --urls

data/bin/codes

@@ -12,6 +12,10 @@ HighLine.track_eof = false
 class CodesApplication
   include Commander::Methods
 
+  def download_verbose_format
+    '%c,%d,%p,%i,%b,%n,%u'
+  end
+
   def run
     program :version, Codes::VERSION
     program :description, 'CLI for \'codes\' - Create promo codes for iOS Apps using the command line'
@@ -27,6 +31,8 @@ class CodesApplication
     global_option '-a', '--app_identifier STRING', 'The bundle ID to download promo codes for'
     global_option '-i', '--apple_id STRING', 'The App ID to download promo codes for'
     global_option '-o', '--output_file STRING', 'The name of the file that should be written to disk. If the file exists, the new codes will be appended.'
+    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.'
 
 
@@ -39,12 +45,24 @@ class CodesApplication
           number_of_codes = count(args)
           apple_id = apple_id(options)
           app_identifier = bundle_id(options, apple_id)
-          urls = options.x || options.urls
+          format = download_format options
 
-          Codes::CodesRunner.run(number_of_codes: number_of_codes, app_identifier: app_identifier, apple_id: apple_id, output_file_path: options.output_file, urls: urls, country: options.country)
+          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)
@@ -62,6 +80,20 @@ class CodesApplication
       user
     end
 
+    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
+
     def bundle_id(options, apple_id)
       app_identifier = options.app_identifier
       app_identifier ||= ENV["CODES_APP_IDENTIFIER"]

data/lib/codes/codes_runner.rb

@@ -1,7 +1,10 @@
 module Codes
   class CodesRunner
-    def self.run(args)
-      Codes::ItunesConnect.new.run args
+    def self.download(args)
+      Codes::ItunesConnect.new.download args
+    end
+    def self.display(args)
+      Codes::ItunesConnect.new.display args
     end
   end
 end

data/lib/codes/itunes_connect.rb

@@ -6,41 +6,38 @@ module Codes
     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]]"
 
-    def run(args)
+    def download(args)
       number_of_codes = args[:number_of_codes]
-      country = args[:country]
 
       code_or_codes = number_of_codes == 1 ? "code" : "codes"
       Helper.log.info "Downloading #{number_of_codes} promo #{code_or_codes}..." 
 
-
-      app_id = args[:apple_id]
-      app_id ||= (FastlaneCore::ItunesSearchApi.fetch_by_identifier(args[:app_identifier], country)['trackId'] rescue nil)
-
-      app_identifier = args[:app_identifier]
-
-      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
-      end
-
-      app = FastlaneCore::ItunesSearchApi.fetch(app_id, country)
-      platform = (app['kind'] == "mac-software" ? "osx" : "ios")
+      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"))
+      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)
+      visit PROMO_URL.gsub("[[app_id]]", @app_id.to_s).gsub("[[platform]]", @platform)
 
       begin
         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
+        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
 
       text_fields.first.set(number_of_codes.to_s)
       click_next
+
+      # are there any errors ?
+      errors = []
+      begin
+         errors = wait_for_elements("div[id=LCPurpleSoftwarePageWrapperErrorMessage]")
+      rescue Exception
+      end
+      raise 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
       click_next
@@ -48,23 +45,69 @@ module Codes
       # 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 = download_codes download_url
+      codes, request_date = download_codes(download_url)
       
-      if args[:urls]
-          codes = codes.split("\n").map do |code|
-              code +" - "+ CODE_URL.gsub("[[code]]", code)
-          end
-          codes = codes.join("\n") + "\n"
-      end
+      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
 
-      Helper.log.info "Your codes were successfully downloaded:".green
+      Helper.log.info "Your codes (requested #{request_date}) were successfully downloaded:".green
       puts codes
     end
 
+    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"
+    end
+
+    def app_platform(app)
+      app['kind'] == "mac-software" ? "osx" : "ios"
+    end
+
+    def display(args)
+      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)
+
+      begin
+        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
+
+      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]
+
+      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
+
+      puts remaining
+    end
+
     def click_next
       wait_for_elements("input.continueActionButton").first.click
     end
@@ -79,8 +122,28 @@ module Codes
         cookie_string << "#{cookie.name}=#{cookie.value};"
       end
 
-      open(url, "Cookie" => cookie_string).read
+      page = open(url, "Cookie" => cookie_string)
+      request_date = page.metas['content-disposition'][0].gsub(/.*filename=.*_(.*).txt/,"\\1")
+      codes = page.read
+
+      return codes, request_date
     end
 
+    private
+
+    def fetch_app_data(args)
+      @country = args[:country]
+      @app_identifier = args[:app_identifier]
+
+      @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
+      end
+
+      app = FastlaneCore::ItunesSearchApi.fetch(@app_id, @country)
+      @platform = app_platform app
+    end
   end
 end

data/lib/codes/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core