itunes_store_transporter 0.1.1 → 0.1.2beta

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4108c78a24a87a971a948d57ce6c38562f83ed17
+  data.tar.gz: 15792381aef3440f4f08bba1856e9ce3cb13b70a
+SHA512:
+  metadata.gz: 20f44051c7fc697f58a42fbe26caddcb4db41ecd0e3799b9474d5f433ce3fa87e747ff14bdef78406dff395036949a415cb98fef1b6a12090dd91af47840e203
+  data.tar.gz: 9b0d9bab5f02325c3e7669e7a2dcdb75ef76eceb9ac0a64c5d2c42989e96ad49ed0bc02f23249011e574fd9aa1c79dead73452512ff269d7b35aa6cfe3a0b506

data/README.rdoc

@@ -1,7 +1,7 @@
 = iTunes::Store::Transporter
 
 {<img src="https://secure.travis-ci.org/sshaw/itunes_store_transporter.png"/>}[http://travis-ci.org/sshaw/itunes_store_transporter]
-{<img src="https://codeclimate.com/badge.png"/>}[https://codeclimate.com/github/sshaw/itunes_store_transporter]
+{<img src="https://codeclimate.com/github/sshaw/itunes_store_transporter.png" />}[https://codeclimate.com/github/sshaw/itunes_store_transporter]
 
 Upload and manage your assets in the iTunes Store using the iTunes Store's Transporter (+iTMSTransporter+).
 
@@ -29,7 +29,7 @@ Upload and manage your assets in the iTunes Store using the iTunes Store's Trans
 
 === Description
 
-iTunes::Store::Transporter is a wrapper around Apple's +iTMSTransporter+ program. It currently
+<code>iTunes::Store::Transporter</code> is a wrapper around Apple's +iTMSTransporter+ program. It currently
 supports the following operations:
 
 * Upload packages
@@ -44,9 +44,15 @@ that it can send email notifications and allows one to set global/per-command de
 
 === Requirements
 
-* Optout v0.0.2 (<code>gem install optout</code>)
+* Optout (<code>gem install optout</code>)
 * iTunes Store Transporter (http://www.apple.com/itunes/sellcontent)
 
+=== Locating iTMSTransporter
+
+If the +iTMSTransporter+ cannot be found in {one your platform's known locations}[https://github.com/sshaw/itunes_store_transporter/tree/master/lib/itunes/store/transporter/shell.rb#L28-L40] you must specify it when creating an instance of <code>iTunes::Store::Transporter</code> via {the <code>:path</code> option}[http://ruby-doc.org/gems/docs/i/itunes_store_transporter-0.1.1/ITunes/Store/Transporter/ITMSTransporter.html#method-c-new-label-Options].
+
+If you're using the bundled +itms+ command you must use its +--path+ option or specify the path in the itms config file. See the +itms+ section for more info.
+
 === Running on Windows
 
 On Windows +iTMSTransporter+ is called via the +iTMSTransporter.CMD+ batch file. This file does not handle the
@@ -73,6 +79,11 @@ This can be fixed by modifying +iTMSTransporter.CMD+ (note that the following do
 * +COMMAND+ - The command (<code>iTunes::Store::Transporter</code> method) to run
 * +OPTIONS+ - These are quivalent to the given +COMMAND+'s options except they must be given in long option format. For example <code>:apple_id => "X123"</code> would be <code>--apple-id=X123</code>. Boolean options can be negated with the <code>--no-</code> prefix.
 
+==== Username, Password, Short Name
+
+Most all commands require your username and password, some require a shortname. These can be specified on the command line
+via the +--username+, +--password+, and +--shortname+ options, or via an +itms+ config file. See the config file section below.
+
 ==== Lookup command
 
 The lookup command differs slightly from the gem by allowing you to download low-quality copies of the assets associated with the looked up metadata.
@@ -144,7 +155,7 @@ As you can see, command options are turned into template variables.
 
 === More Info
 
-* Docs: http://ruby-doc.org/gems/docs/i/itunes_store_transporter-0.1.0/README_rdoc.html
+* Docs: http://ruby-doc.org/gems/docs/i/itunes_store_transporter-0.1.1/README_rdoc.html
 * Bugs: http://github.com/sshaw/itunes_store_transporter/issues
 * Source Code: http://github.com/sshaw/itunes_store_transporter
 * Web Based GUI: http://github.com/sshaw/itunes_store_transporter_web

data/lib/itunes/store/transporter/output_parser.rb

@@ -13,8 +13,8 @@ module ITunes
         attr :errors
         attr :warnings
 
-        ERROR_LINE = />\s+ERROR:\s+(.+)/
-        WARNING_LINE = />\s+WARN:\s+(.+)/
+        ERROR_LINE = /<main>\s+ERROR:\s+(.+)/
+        WARNING_LINE = /<main>\s+WARN:\s+(.+)/
 
         # Generic messages we want to ignore.
         SKIP_ERRORS = [ /\boperation was not successful/i,

data/lib/itunes/store/transporter/shell.rb

@@ -11,6 +11,8 @@ module ITunes
         EXE_NAME = "iTMSTransporter"
         WINDOWS_EXE = "#{EXE_NAME}.CMD"
         DEFAULT_UNIX_PATH = "/usr/local/itms/bin/#{EXE_NAME}"
+        DEFAULT_OSX_PATHS = ["/Developer/Applications/Utilities/Application Loader.app/Contents/MacOS/itms/bin/#{EXE_NAME}",
+                             "/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/MacOS/itms/bin/#{EXE_NAME}"]
 
         class << self
           def windows?
@@ -18,44 +20,51 @@ module ITunes
             # can crow when it receives a Windows path.
             ChildProcess.windows? || ChildProcess.os == :cygwin
           end
-          
+
+          def osx?
+            ChildProcess.os == :macosx
+          end
+
           def default_path
-            if windows?
-              # The Transporter installer prefers x86
-              # But... I think ruby normalizes this to just PROGRAMFILES
-              root = ENV["PROGRAMFILES(x86)"] || ENV["PROGRAMFILES"] # Need C:\ in case?
-              File.join(root, "itms", WINDOWS_EXE)
-            else
-              DEFAULT_UNIX_PATH
+            case
+              when windows?
+                # The Transporter installer prefers x86
+                # But... I think ruby normalizes this to just PROGRAMFILES
+                root = ENV["PROGRAMFILES(x86)"] || ENV["PROGRAMFILES"] # Need C:\ in case?
+                File.join(root, "itms", WINDOWS_EXE)
+              when osx?
+                DEFAULT_OSX_PATHS.find { |path| File.exist?(path) } || DEFAULT_UNIX_PATH
+              else
+                DEFAULT_UNIX_PATH
             end
           end
         end
-        
+
         def initialize(path = nil)
           @path = path || self.class.default_path
         end
-        
+
         def exec(argv, &block)
           raise ArgumentError, "block required" unless block_given?
 
-          begin 
+          begin
             process = ChildProcess.build(path, *argv)
-            
+
             stdout = IO.pipe
             stderr = IO.pipe
-            
+
             stdout[1].sync = true
             process.io.stdout = stdout[1]
 
             stderr[1].sync = true
             process.io.stderr = stderr[1]
-            
+
             process.start
 
             stdout[1].close
             stderr[1].close
 
-            poll(stdout[0], stderr[0], &block)          
+            poll(stdout[0], stderr[0], &block)
           rescue ChildProcess::Error, SystemCallError => e
             raise TransporterError, e.message
           ensure
@@ -65,27 +74,27 @@ module ITunes
 
           process.exit_code
         end
-        
+
         private
         def poll(stdout, stderr)
           read = [ stdout, stderr ]
-          
+
           loop do
             # TODO: Not working on jruby
             if ready = select(read, nil, nil, 1)
               ready.each do |set|
                 next unless set.any?
-                
+
                 set.each do |io|
                   if io.eof?
                     read.delete(io)
                     next
                   end
-                  
+
                   name = io == stdout ? :stdout : :stderr
                   yield(io.gets, name)
                 end
-                
+
               end
             end
             break unless read.any?

data/lib/itunes/store/transporter/version.rb

@@ -1,7 +1,7 @@
 module ITunes
   module Store
     module Transporter
-      VERSION = "0.1.1"
+      VERSION = "0.1.2beta"
     end
   end
 end

data/spec/fixtures/errors_and_warnings.yml

@@ -2,7 +2,7 @@ no_error_number: |
     [2000-01-01 00:00:00] <main>  INFO: Transporter is doing something fun
     [2000-01-01 00:00:00] <main>  INFO: Transporter is still doing some fun stuff
     [2000-01-01 00:00:00] <main> ERROR: "An error occurred while doing fun stuff" at Location1 (Class)
-    [2000-01-01 00:00:00] <Some Class> ERROR: "An exception has occurred: network timeout" at Location2 (Class)
+    [2000-01-01 00:00:00] <main> ERROR: "An exception has occurred: network timeout" at Location2 (Class)
     [2000-01-01 00:00:00] <main> DBG-X: About to exit
 
     Package Summary:
@@ -26,7 +26,7 @@ with_error_number: |
         ERROR ITMS-4000 "This is error 4000"
         ERROR ITMS-5000 "This is error 5000"
 
-single_warning: |  
+single_warning: |
   [2000-01-01 00:00:00] <main>  INFO: Transporter is doing something fun
   [2000-01-01 00:00:00] <main> WARN: WARNING ITMS-4010: "You've been warned!" at Location1 (Class)
   [2000-01-01 00:00:00] <main>  INFO: I'm outta here
@@ -43,3 +43,16 @@ duplicate_errors: |
     [2000-01-01 00:00:00] <main>  INFO: Transporter is doing something fun
     [2000-01-01 00:00:00] <main> ERROR: ERROR ITMS-7000: "Error 3" at Location3 (ClassX)
     [2000-01-01 00:00:00] <main>  INFO: I'm outta here
+
+error_from_main_and_class: |
+    [2000-01-01 00:00:00] <main>  INFO: Transporter is doing something fun
+    [2000-01-01 00:00:00] <main>  INFO: Transporter is still doing some fun stuff
+    [2000-01-01 00:00:00] <in.some.Class> ERROR: "An exception has occurred in.some.Class: network timeout"
+    [2000-01-01 00:00:00] <main>  INFO: Transporter is still doing some fun stuff
+    [2000-01-01 00:00:00] <main>  ERROR: Another error has occurred
+    [2000-01-01 00:00:00] <main> DBG-X: About to exit
+
+    Package Summary:
+
+      1 package was uploaded successfully:
+    	/home/sshaw/123123123.itmsp

data/spec/output_parser_spec.rb

@@ -1,68 +1,78 @@
 require "spec_helper"
 
 describe ITunes::Store::Transporter::OutputParser do
-  describe "parsing errors" do     
+  describe "parsing errors" do
     # TODO: test various error message/code formats handled by the parser
 
-    context "without an error code" do 
+    context "without an error code" do
       before(:all) { @parser = described_class.new(fixture("errors_and_warnings.no_error_number")) }
 
       subject { @parser }
       its(:warnings) { should be_empty }
       its(:errors) { should have(2).items }
 
-      describe "the first error" do 
+      describe "the first error" do
         subject { @parser.errors.first }
         its(:code) { should be_nil }
         its(:message) { should == "An error occurred while doing fun stuff" }
       end
 
-      describe "the second error" do 
+      describe "the second error" do
         subject { @parser.errors.last }
         its(:code) { should be_nil }
         its(:message) { should == "An exception has occurred: network timeout" }
       end
     end
 
-    context "with an error code" do 
+    context "with errors from main and from a class" do
+      before(:all) { @parser = described_class.new(fixture("errors_and_warnings.error_from_main_and_class")) }
+      subject { @parser }
+
+      it "only parses the error from main" do
+        expect(@parser.errors.size).to eq 1
+        expect(@parser.errors.first.message).to eq "Another error has occurred"
+      end
+    end
+
+    context "with an error code" do
       before(:all) { @parser = described_class.new(fixture("errors_and_warnings.with_error_number")) }
-      
+
       subject { @parser }
       its(:warnings) { should be_empty }
       its(:errors) { should have(2).items }
-      
 
-      describe "the first error" do 
+
+      describe "the first error" do
         subject { @parser.errors.first }
         its(:code) { should == 4000 }
         its(:message) { should == "This is error 4000" }
       end
 
-      describe "the second error" do 
+      describe "the second error" do
         subject { @parser.errors.last }
         its(:code) { should == 5000 }
         its(:message) { should == "This is error 5000" }
       end
     end
 
-    context "with duplicate messages" do 
+    context "with duplicate messages" do
       before(:all) { @parser = described_class.new(fixture("errors_and_warnings.duplicate_errors")) }
-      
-      it "does not include duplicates" do 
+
+      it "does not include duplicates" do
         errors = @parser.errors.map { |e| e.message }
         errors.should == ["Error 1", "Error 2", "Error 3"]
       end
     end
   end
 
-  describe "parsing warnings" do 
+  describe "parsing warnings" do
     before(:all) { @parser = described_class.new(fixture("errors_and_warnings.single_warning")) }
 
     subject { @parser }
     its(:errors) { should be_empty }
     its(:warnings) { should have(1).item }
 
-    describe "the warning" do 
+    describe "the warning" do
       subject { @parser.warnings.first }
       its(:code) { should == 4010 }
       its(:message) { should == "You've been warned!" }

data/spec/shell_spec.rb

@@ -45,14 +45,31 @@ describe ITunes::Store::Transporter::Shell do
     before(:all) { ENV["PROGRAMFILES"] = "C:\\" }
 
     it "selects the Windows executable" do
-      described_class.stub(:windows? => true)
+      described_class.stub(:windows? => true, :osx? => false)
       described_class.new.path.should match /#{described_class::WINDOWS_EXE}\Z/
     end
   end
 
-  context "when on anything but Windows" do
+  context "when on OS X" do
+    before { described_class.stub(:windows? => false, :osx? => true) }
+
+    it "selects the right executable" do
+      exe = described_class::DEFAULT_OSX_PATHS.first
+      File.stub(:exist? => true)
+      described_class.new.path.should == exe
+    end
+
+    context "and no OS X specific executable is found" do
+      it "defaults to the *nix executable" do
+        File.stub(:exist? => false)
+        described_class.new.path.should match /#{described_class::DEFAULT_UNIX_PATH}\Z/
+      end
+    end
+  end
+
+  context "when not on Windows or OS X" do
     it "selects the right executable" do
-      described_class.stub(:windows? => false)
+      described_class.stub(:windows? => false, :osx? => false)
       described_class.new.path.should match /#{described_class::EXE_NAME}\Z/
     end
   end

metadata

@@ -1,64 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: itunes_store_transporter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2beta
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &70194171326300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70194171326300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: optout
-  requirement: &70194171325780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70194171325780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70194171325120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70194171325120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70194171324440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70194171324440
-description: ! "    iTunes::Store::Transporter is a wrapper around Apple's iTMSTransporter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+description: "    iTunes::Store::Transporter is a wrapper around Apple's iTMSTransporter
   program. It allows you to upload packages to the \n    Apple Store, validate them,
   retrieve status information, lookup metadata, and more!\n"
 email: skye.shaw@gmail.com
@@ -69,6 +83,11 @@ extra_rdoc_files:
 - README.rdoc
 - Changes
 files:
+- Changes
+- README.rdoc
+- bin/itms
+- lib/itunes/store/transporter.rb
+- lib/itunes/store/transporter/command.rb
 - lib/itunes/store/transporter/command/lookup.rb
 - lib/itunes/store/transporter/command/option.rb
 - lib/itunes/store/transporter/command/providers.rb
@@ -77,13 +96,11 @@ files:
 - lib/itunes/store/transporter/command/upload.rb
 - lib/itunes/store/transporter/command/verify.rb
 - lib/itunes/store/transporter/command/version.rb
-- lib/itunes/store/transporter/command.rb
 - lib/itunes/store/transporter/errors.rb
 - lib/itunes/store/transporter/itms_transporter.rb
 - lib/itunes/store/transporter/output_parser.rb
 - lib/itunes/store/transporter/shell.rb
 - lib/itunes/store/transporter/version.rb
-- lib/itunes/store/transporter.rb
 - spec/command_spec.rb
 - spec/errors_spec.rb
 - spec/fixtures/errors_and_warnings.yml
@@ -95,14 +112,12 @@ files:
 - spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/transporter_spec.rb
-- README.rdoc
-- Changes
-- bin/itms
 homepage: http://github.com/sshaw/itunes_store_transporter
 licenses:
 - MIT
-post_install_message: ! "\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n
-  \ !!          ATTENTION WINDOWS USERS             !!\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n
+metadata: {}
+post_install_message: "\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n  !!
+  \         ATTENTION WINDOWS USERS             !!\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n
   \ \n  You must make a small change to the iTMSTransporter.CMD batch file, otherwise
   \n  this library will not function correctly. \n  \n  For details see: http://github.com/sshaw/itunes_store_transporter#running-on-windows
   \ \n\n"
@@ -110,22 +125,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Upload and manage your assets in the iTunes Store using the iTunes Store's
   Transporter (iTMSTransporter).
 test_files:
@@ -140,4 +153,3 @@ test_files:
 - spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/transporter_spec.rb
-has_rdoc: