pem 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fc19714bc242012832215934e264482b7975d74
-  data.tar.gz: 400fe9cf403ec11b531ae781398d91452e2e4a5c
+  metadata.gz: 5113d3a0b7c34285b2ae53df264b7ff74c14d631
+  data.tar.gz: 25849e4e7815c1756c4cc3be3d09269a1199e920
 SHA512:
-  metadata.gz: 6c027708274cd3614282aff3451340fccf8bcea5e2f785b4f0f9e62597d7d0f2ca3e153743672907eec56184259656b471e023c315ea47d3eb188febcb9d6156
-  data.tar.gz: ec63a4e73973e37c7da00d698d3894e576c194a5781da3b7ac77730fce4a39bf62cf5b33ce3aeb84f1c37dc973a75a502c6adf907818e8a0f83487e8d1198412
+  metadata.gz: f385fe1bdfa680067687e8431345d315a5b6df8f67f3a7323551c190d3b15ba1ff4bccc9399e9fc75b303f4b9937a7a21406a2a7034da224327f93f64944a70d
+  data.tar.gz: 8551602780f0c56612f4b76a64e0628215bea5a75078b5f99f6056f13afa44a25890fb2f6ec8f16e5aa5df373094fc3ac3dfeab1a03cab093fc4120aa4e7e3e1

data/README.md

@@ -109,7 +109,7 @@ There are 2 actions involved:
 
 
 ## How is my password stored?
-```PEM``` 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.
+```PEM``` 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
 
@@ -129,7 +129,7 @@ It will show you the ```pem``` files like this:
 
 
 # Need help?
-- If there is a technical problem with ```PEM```, submit an issue. Run ```pem --trace``` to get the stacktrace.
+- If there is a technical problem with ```PEM```, submit an issue.
 - I'm available for contract work - drop me an email: pem@krausefx.com
 
 # License

data/bin/pem

@@ -3,61 +3,69 @@
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'pem'
-require 'commander/import'
+require 'commander'
 require 'credentials_manager/password_manager'
 require 'credentials_manager/appfile_config'
 
 HighLine.track_eof = false
 
+class PemApplication
+  include Commander::Methods
 
-# Commander
-program :version, PEM::VERSION
-program :description, 'CLI for \'PEM\' - Automatically generate and renew your push notification profiles'
-program :help, 'Author', 'Felix Krause <pem@krausefx.com>'
-program :help, 'Website', 'http://fastlane.tools'
-program :help, 'GitHub', 'https://github.com/krausefx/PEM'
-program :help_formatter, :compact
+  def run
+    program :version, PEM::VERSION
+    program :description, 'CLI for \'PEM\' - Automatically generate and renew your push notification profiles'
+    program :help, 'Author', 'Felix Krause <pem@krausefx.com>'
+    program :help, 'Website', 'http://fastlane.tools'
+    program :help, 'GitHub', 'https://github.com/krausefx/PEM'
+    program :help_formatter, :compact
 
-global_option('--verbose') { $verbose = true }
+    always_trace!
 
+    global_option '--development', 'Renew the development push certificate instead of the production one'
+    global_option '-u', '--username STRING', 'Your Apple ID username'
+    global_option '-a', '--identifier STRING', String, 'The bundle identifier of your app'
 
-command :renew do |c|
-  c.syntax = 'pem renew'
-  c.description = 'Renews the certificate (in case it expired) and returns the path to the generated pem file'
+    command :renew do |c|
+      c.syntax = 'pem renew'
+      c.description = 'Renews the certificate (in case it expired) and shows the path to the generated pem file'
 
-  c.option '-a', '--identifier STRING', String, 'The bundle identifier of your app'
-  c.option '-u', '--username STRING', String, 'Your Apple ID username'
-  c.option '--development', 'Renew the development push certificate instead of the production one'
+      c.action do |args, options|
+        app = app_identifier(options)
+        username(options)
 
-  c.action do |args, options|
-    app = app_identifier(options)
-    username(options)
+        path = PEM::CertManager.new.run(app, !options.development)
 
-    path = PEM::CertManager.new.run(app, !options.development)
-
-    if path
-      file_name = File.basename(path)
-      output = "./#{file_name}"
-      FileUtils.mv(path, output)
-      puts output.green
+        if path
+          file_name = File.basename(path)
+          output = "./#{file_name}"
+          FileUtils.mv(path, output)
+          puts output.green
+        end
+      end
     end
+
+    default_command :renew
+
+    run!
   end
-end
 
-default_command :renew
+  def username(options)
+    user = options.username
+    user ||= ENV["PEM_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["PEM_USERNAME"]
-  user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
-  
-  CredentialsManager::PasswordManager.shared_manager(user) if user
-end
+  def app_identifier(options)
+    value = options.identifier
+    value ||= ENV["PEM_APP_IDENTIFIER"]
+    value ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
+    value ||= ask("App Identifier (Bundle ID, e.g. com.krausefx.app): ")
+    return value
+  end
 
-def app_identifier(options)
-  value = options.identifier
-  value ||= ENV["PEM_APP_IDENTIFIER"]
-  value ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
-  value ||= ask("App Identifier (Bundle ID, e.g. com.krausefx.app): ")
-  return value
 end
+
+PemApplication.new.run

data/lib/pem/developer_center.rb

@@ -68,7 +68,7 @@ module PEM
         user ||= CredentialsManager::PasswordManager.shared_manager.username
         password ||= CredentialsManager::PasswordManager.shared_manager.password
 
-        result = visit DEVELOPER_CENTER_URL
+        result = visit APP_IDS_URL
         raise "Could not open Developer Center" unless result['status'] == 'success'
 
         wait_for_elements(".button.blue").first.click
@@ -86,37 +86,17 @@ module PEM
         all(".button.large.blue.signin-button").first.click
 
         begin
-          if page.has_content?"Select Your Team" # If the user is not on multiple teams
-            team_id = ENV["PEM_TEAM_ID"]
-            unless team_id
-              Helper.log.info "You can store you preferred team using the environment variable `PEM_TEAM_ID`".green
-              Helper.log.info "Your ID belongs to the following teams:".green
-              
-              teams = find("select").all('option') # Grab all the teams data
-              teams.each_with_index do |val, index|
-                team_text = val.text
-                description_text = val.value
-                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].value # Select the desired team
-            end
-          within 'select' do
-            find("option[value='#{team_id}']").select_option
+          if page.has_content?"Select Team" # If the user is not on multiple teams
+            select_team
           end
-            
-         all("#saveTeamSelection_saveTeamSelection").first.click
-         end
         rescue => ex
           Helper.log.debug ex
           raise DeveloperCenterLoginError.new("Error loggin in user #{user}. User is on multiple teams and we were unable to correctly retrieve them.")
         end
 
         begin
-          
-          wait_for_elements('#aprerelease')
+          visit APP_IDS_URL
+          wait_for_elements('.ios.bundles.gridList')
         rescue => ex
           Helper.log.debug ex
           raise DeveloperCenterLoginError.new("Error logging in user #{user} with the given password. Make sure you entered them correctly.")
@@ -130,6 +110,49 @@ module PEM
       end
     end
 
+    def select_team
+      team_id = ENV["PEM_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 `PEM_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 APP_IDS_URL
+      raise "Could not open Developer Center" unless result['status'] == 'success'
+    end
+
     # This method will enable push for the given app
     # and download the cer file in any case, no matter if it existed before or not
     # @return the path to the push file
@@ -160,6 +183,7 @@ module PEM
       def open_app_page(app_identifier)
         begin
           visit APP_IDS_URL
+          sleep 5
 
           apps = all(:xpath, "//td[@title='#{app_identifier}']")
           if apps.count == 1
@@ -264,7 +288,6 @@ module PEM
 
           counter += 1
           if counter > 100
-            Helper.log.debug page.html
             Helper.log.debug caller
             raise DeveloperCenterGeneralError.new("Couldn't find element '#{name}' after waiting for quite some time")
           end

data/lib/pem/version.rb

@@ -1,3 +1,3 @@
 module PEM
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pem
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.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