sigh 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3c9e9bd59797f783963393887bc4b657263cbff
-  data.tar.gz: 7181fd01ed4195cab98e96b587d72e32f3485e75
+  metadata.gz: 842fa29839a7bef24356403b43a1e71a4e86dca7
+  data.tar.gz: a8c3136908d566be66ed6475caf9930ca040df7d
 SHA512:
-  metadata.gz: 95edbbbedc59167c0b3c4ce99a0d2ababbf954b70f91b7743e89a060c61a7e204c69bbdfd2944e36331cb0090026dd9f2f031cdeba8cdcc7d17e288333cdb131
-  data.tar.gz: c7a347854360557aafcf6c8ae32ac93b788df3f48833bb871c7d017e72aee91dfed50bef002f0479b6cc6bfbb8c20d57bf26f87dcda08ca18e5b70ddcd428356
+  metadata.gz: 65bc97c43df673d449516cc962085a189bd62a26fa2aa367bf5e29121554ea0f30d5095215bb984db5a7cf7f31f192c9ff87f372942547087272aca4ccc0a320
+  data.tar.gz: fa01ff066816aa5686621374a5aab8ac4e4fb094fef5cd64f2f867f6969851a01da4e0c268acc06605e31b17ebbbf256fb41d9539daa8e41df85540411f5b3a6

data/README.md

@@ -121,6 +121,7 @@ In case you prefer environment variables:
 - ```SIGH_USERNAME```
 - ```SIGH_APP_IDENTIFIER```
 - ```SIGH_TEAM_ID``` (The Team ID, e.g. `Q2CBPK58CA`)
+- `SIGH_DISABLE_OPEN_ERROR` - in case of error, `sigh` won't open Preview with a screenshot of the error when this variable is set.
 
 # How does it work?
 
@@ -128,7 +129,7 @@ In case you prefer environment variables:
 
 
 ## How is my password stored?
-```sigh``` uses the password manager from [```Deliver```](https://github.com/KrauseFx/deliver#can-i-trust-deliver). Take a look the [Deliver README](https://github.com/KrauseFx/deliver#can-i-trust-deliver) for more information.
+```sigh``` uses the [password manager](https://github.com/KrauseFx/CredentialsManager) from `fastlane`. Take a look the [CredentialsManager README](https://github.com/KrauseFx/CredentialsManager) for more information.
 
 # Tips
 ## [`fastlane`](http://fastlane.tools) Toolchain
@@ -147,7 +148,7 @@ It will show you the ```mobileprovision``` files like this:
 
 
 # Need help?
-- If there is a technical problem with ```sigh```, submit an issue. Run ```sigh --trace``` to get the stacktrace.
+- If there is a technical problem with ```sigh```, submit an issue.
 - I'm available for contract work - drop me an email: sigh@krausefx.com
 
 # License

data/bin/sigh

@@ -3,71 +3,79 @@
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'sigh'
-require 'commander/import'
+require 'commander'
 require 'credentials_manager/password_manager'
 require 'credentials_manager/appfile_config'
 
 HighLine.track_eof = false
 
+class SighApplication
+  include Commander::Methods
 
-# Commander
-program :version, Sigh::VERSION
-program :description, 'CLI for \'sigh\' - Because you would rather spend your time building stuff than fighting provisioning'
-program :help, 'Author', 'Felix Krause <sigh@krausefx.com>'
-program :help, 'Website', 'http://fastlane.tools'
-program :help, 'GitHub', 'https://github.com/krausefx/sigh'
-program :help_formatter, :compact
+  def run
+    program :version, Sigh::VERSION
+    program :description, 'CLI for \'sigh\' - Because you would rather spend your time building stuff than fighting provisioning'
+    program :help, 'Author', 'Felix Krause <sigh@krausefx.com>'
+    program :help, 'Website', 'http://fastlane.tools'
+    program :help, 'GitHub', 'https://github.com/krausefx/sigh'
+    program :help_formatter, :compact
 
-global_option('--verbose') { $verbose = true }
+    always_trace!
 
+    global_option '--adhoc', 'By default, sigh will create and renew App Store profiles. Setting this flag will generate Adhoc profiles instead.'
+    global_option '--skip_install', 'By default, the certificate will be added on your local machine. Setting this flag will skip this action.'
+    global_option '--development', 'Renew the development certificate instead of the production one.'
 
-command :renew do |c|
-  c.syntax = 'sigh renew'
-  c.description = 'Renews the certificate (in case it expired) and outputs the path to the generated file'
+    global_option '-a', '--identifier STRING', String, 'The bundle identifier of your app.'
+    global_option '-u', '--username STRING', String, 'Your Apple ID username.'
+    global_option '-n', '--cert_name STRING', String, 'The name of the generated certificate file.'
+    global_option '-o', '--output STRING', String, 'The folder in which the file should be generated.'
 
-  c.option '-a', '--identifier STRING', String, 'The bundle identifier of your app'
-  c.option '-u', '--username STRING', String, 'Your Apple ID username'
-  c.option '-n', '--cert_name STRING', String, 'The name of the generated certificate file.'
-  c.option '-o', '--output STRING', String, 'The folder in which the file should be generated.'
-  c.option '--adhoc', 'By default, sigh will create and renew App Store profiles. Setting this flag will generate Adhoc profiles instead.'
-  c.option '--skip_install', 'By default, the certificate will be added on your local machine. Setting this flag will skip this action.'
-  c.option '--development', 'Renew the development certificate instead of the production one'
+    command :renew do |c|
+      c.syntax = 'sigh renew'
+      c.description = 'Renews the certificate (in case it expired) and outputs the path to the generated file'
 
-  c.action do |args, options|
-    app = app_identifier(options)
-    username(options)
+      c.action do |args, options|
+        app = app_identifier(options)
+        username(options)
 
-    type = Sigh::DeveloperCenter::APPSTORE
-    type = Sigh::DeveloperCenter::ADHOC if options.adhoc 
-    type = Sigh::DeveloperCenter::DEVELOPMENT if options.development
-    
-    path = Sigh::DeveloperCenter.new.run(app, type, options.cert_name)
-
-    if path
-      file_name = File.basename(path)
-      output_path = options.output || '.'
-      output = File.join(output_path.gsub("~", ENV["HOME"]), file_name)
-      FileUtils.mv(path, output)
-      system("open '#{output}'") unless options.skip_install
-      puts output.green
+        type = Sigh::DeveloperCenter::APPSTORE
+        type = Sigh::DeveloperCenter::ADHOC if options.adhoc 
+        type = Sigh::DeveloperCenter::DEVELOPMENT if options.development
+        
+        path = Sigh::DeveloperCenter.new.run(app, type, options.cert_name)
+
+        if path
+          file_name = File.basename(path)
+          output_path = options.output || '.'
+          output = File.join(output_path.gsub("~", ENV["HOME"]), file_name)
+          FileUtils.mv(path, output)
+          system("open -g '#{output}'") unless options.skip_install
+          puts output.green
+        end
+      end
     end
+
+    default_command :renew
+
+    run!
   end
-end
 
-default_command :renew
+  def username(options)
+    user = options.username
+    user ||= ENV["SIGH_USERNAME"]
+    user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
+    
+    CredentialsManager::PasswordManager.shared_manager(user) if user
+  end
 
-def username(options)
-  user = options.username
-  user ||= ENV["SIGH_USERNAME"]
-  user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
-  
-  CredentialsManager::PasswordManager.shared_manager(user) if user
+  def app_identifier(options)
+    value = options.identifier
+    value ||= ENV["SIGH_APP_IDENTIFIER"]
+    value ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
+    value ||= ask("App Identifier (Bundle ID, e.g. com.krausefx.app): ")
+    return value
+  end
 end
 
-def app_identifier(options)
-  value = options.identifier
-  value ||= ENV["SIGH_APP_IDENTIFIER"]
-  value ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
-  value ||= ask("App Identifier (Bundle ID, e.g. com.krausefx.app): ")
-  return value
-end
+SighApplication.new.run

data/lib/sigh/developer_center.rb

@@ -95,28 +95,7 @@ module Sigh
 
         begin
           if page.has_content?"Select Team" # If the user is not on multiple teams
-            team_id = ENV["SIGH_TEAM_ID"]
-            unless team_id
-              Helper.log.info "You can store you preferred team using the environment variable `SIGH_TEAM_ID`".green
-              Helper.log.info "Your ID belongs to the following teams:".green
-              
-              teams = find("div.input").all('.team-value') # Grab all the teams data
-              teams.each_with_index do |val, index|
-                team_text = val.find(".label-primary").text
-                description_text = val.find(".label-secondary").text
-                description_text = " (#{description_text})" unless description_text.empty? # Include the team description if any
-                Helper.log.info "\t#{index + 1}. #{team_text}#{description_text}".green # Print the team index and team name
-              end
-
-              team_index = ask("Please select the team number you would like to access: ".green)
-              team_id = teams[team_index.to_i - 1].find(".radio").value
-            end
-
-            first(:xpath, "//input[@type='radio' and @value='#{team_id}']").click # Select the desired team
-            all(".button.large.blue.submit").first.click
-
-            result = visit PROFILES_URL
-            raise "Could not open Developer Center" unless result['status'] == 'success'
+            select_team
           end
         rescue => ex
           Helper.log.debug ex
@@ -144,6 +123,50 @@ module Sigh
       end
     end
 
+
+    def select_team
+      team_id = ENV["SIGH_TEAM_ID"]
+      team_id = nil if team_id.to_s.length == 0
+
+      unless team_id
+        Helper.log.info "You can store you preferred team using the environment variable `SIGH_TEAM_ID`".green
+        Helper.log.info "Your ID belongs to the following teams:".green
+      end
+      
+      available_options = []
+
+      teams = find("div.input").all('.team-value') # Grab all the teams data
+      teams.each_with_index do |val, index|
+        current_team_id = '"' + val.find("input").value + '"'
+        team_text = val.find(".label-primary").text
+        description_text = val.find(".label-secondary").text
+        description_text = "(#{description_text})" unless description_text.empty? # Include the team description if any
+        index_text = (index + 1).to_s + "."
+
+        available_options << [index_text, current_team_id, team_text, description_text].join(" ")
+      end
+
+      unless team_id
+        puts available_options.join("\n").green
+        team_index = ask("Please select the team number you would like to access: ".green)
+        team_id = teams[team_index.to_i - 1].find(".radio").value
+      end
+
+      team_button = first(:xpath, "//input[@type='radio' and @value='#{team_id}']") # Select the desired team
+      if team_button
+        team_button.click
+      else
+        Helper.log.fatal "Could not find given Team. Available options: ".red
+        puts available_options.join("\n").yellow
+        raise DeveloperCenterLoginError.new("Error finding given team #{team_id}.".red)
+      end
+
+      all(".button.large.blue.submit").first.click
+
+      result = visit PROFILES_URL
+      raise "Could not open Developer Center" unless result['status'] == 'success'
+    end
+
     def run(app_identifier, type, cert_name = nil)
       cert = maintain_app_certificate(app_identifier, type)
 
@@ -248,7 +271,7 @@ module Sigh
       # example: <option value="RGAWZGXSY4">ABP (5A997XSHK2.net.sunapps.34)</option>
       identifiers = all(:xpath, "//option[contains(text(), '.#{app_identifier})')]")
       if identifiers.count == 0
-        puts "Couldn't find App ID '#{app_identifier}'\nonly found:".red
+        puts "Couldn't find App ID '#{app_identifier}'\nonly found the following bundle identifiers:".red
         all(:xpath, "//option").each do |current|
           puts "\t- #{current.text}".yellow
         end
@@ -419,7 +442,7 @@ module Sigh
       def snap
         path = "Error#{Time.now.to_i}.png"
         save_screenshot(path, :full => true)
-        system("open '#{path}'")
+        system("open '#{path}'") unless ENV['SIGH_DISABLE_OPEN_ERROR']
       end
 
       def wait_for(method, parameter, success)
@@ -428,13 +451,12 @@ module Sigh
         while !success.call(result)     
           sleep 0.2
 
-        result = method.call(parameter)
+          result = method.call(parameter)
 
           counter += 1
           if counter > 100
-            Helper.log.debug page.html
             Helper.log.debug caller
-            raise DeveloperCenterGeneralError.new("Couldn't find '#{name}' after waiting for quite some time")
+            raise DeveloperCenterGeneralError.new("Couldn't find '#{parameter}' after waiting for quite some time")
           end
         end
         return result

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json