itunes_store_transporter 0.0.1 → 0.0.2

data/lib/itunes/store/transporter/command/lookup.rb

@@ -1,3 +1,4 @@
+require "tmpdir"
 require "fileutils"
 require "itunes/store/transporter/errors"
 require "itunes/store/transporter/command"
@@ -24,7 +25,7 @@ module ITunes
             options[:destination] = Dir.mktmpdir
             super 
           ensure
-            FileUtils.rm_rf(options[:destination])
+            FileUtils.rm_rf(options[:destination]) if options[:destination]
           end
 
           protected
@@ -33,13 +34,13 @@ module ITunes
             path = File.join(options[:destination], "#{id}.itmsp", "metadata.xml")
 
             if !File.exists?(path)
-              raise ITunes::Store::Transporter::TransporterError, "No metadata file exists at #{path}"
+              raise TransporterError, "No metadata file exists at #{path}"
             end
 
             begin 
               metadata = File.read(path) 
             rescue StandardError => e
-              raise ITunes::Store::Transporter::TransporterError, "Failed to read metadata file #{path}: #{e}"
+              raise TransporterError, "Failed to read metadata file #{path}: #{e}"
             end
 
             metadata

data/lib/itunes/store/transporter/command/status.rb

@@ -10,24 +10,38 @@ module ITunes
         #
         class Status < Mode
           def initialize(*config)
-            super
+            super 
             options.on *VENDOR_ID
           end
 
           protected 
           def handle_success(stdout_lines, stderr_lines, options) 
             status = {}
-            stdout_lines.each do |line|
-              next unless line =~ /\A\s*\w/
-              key, value = line.split(/:\s+/, 2).map(&:strip)
-              key.gsub!(/\s+/, "_")
-              key.downcase!
-              status[key.to_sym] = value
+            while line = stdout_lines.shift
+              next unless line =~ /\S+/
+              if line =~ /\A--+/
+                entry = {}
+                while line = stdout_lines.shift
+                  break unless line =~ /\A\s*\w/
+                  key, value = parse_line(line)
+                  entry[key] = value
+                end
+                (status[:status] ||= []) << entry
+              else
+                key, value = parse_line(line)
+                status[key] = value
+              end
             end
             status
-          end
-        end        
+          end             
 
+          def parse_line(line)
+            key, value = line.split(/:\s+/, 2).map(&:strip)
+            key.gsub!(/\s+/, "_")
+            key.downcase!
+            [key.to_sym, value]
+          end
+        end                   
       end
     end
   end

data/lib/itunes/store/transporter/command/verify.rb

@@ -20,11 +20,17 @@ module ITunes
           end
 
           protected
+          def create_transporter_options(optz)
+            # Include the option if false
+            optz[:verify_assets] = !optz[:verify_assets] if optz.include?(:verify_assets)
+            super
+          end
+
           # Verify mode returns 0 if there are no packages to verify but will emit an error message about the lack of packages
           def handle_success(stdout_lines, stderr_lines, options)
-            parser = Transporter::OutputParser.new(stderr_lines)
+            parser = OutputParser.new(stderr_lines)
             if parser.errors.any?
-              raise ITunes::Store::Transporter::ExecutionError.new(parser.errors, 0)
+              raise ExecutionError.new(parser.errors, 0)
             else
               true
             end
@@ -34,4 +40,3 @@ module ITunes
     end
   end
 end
-

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

@@ -5,78 +5,77 @@ module ITunes
     class Transporter
       class OutputParser
 
-	##
-	# This class extracts error and warning messages output by +iTMSTransporter+. For each message
-        # is creates an instance of ITunes::Store::Transporter::TransporterMessage 
-	#
+        ##
+        # This class extracts error and warning messages output by +iTMSTransporter+. For each message
+        # is creates an instance of ITunes::Store::Transporter::TransporterMessage
+        #
 
-	attr :errors
-	attr :warnings
+        attr :errors
+        attr :warnings
 
-	ERROR_LINE = />\s+ERROR:\s+(.+)/
-	WARNING_LINE = />\s+WARN:\s+(.+)/
+        ERROR_LINE = />\s+ERROR:\s+(.+)/
+        WARNING_LINE = />\s+WARN:\s+(.+)/
 
-	# Generic messages we want to ignore.
-	SKIP_ERRORS = [ /\boperation was not successful/i,
+        # Generic messages we want to ignore.
+        SKIP_ERRORS = [ /\boperation was not successful/i,
                         /\bunable to verify the package/i,
                         /\bwill NOT be verified/,
                         /^an error has occurred/i,
                         /^an error occurred while/i,
                         /^unknown operation/i,
-			/\bunable to authenticate the package/i ]
+                        /\bunable to authenticate the package/i ]
 
-	##
-	# === Arguments
-	#
-	# [output (Array)]  +iTMSTransporter+ output
-	#
-	def initialize(output)
-	  @errors = []
-	  @warnings = []
-	  parse_output(output) if Array === output
-	end
+        ##
+        # === Arguments
+        #
+        # [output (Array)]  +iTMSTransporter+ output
+        #
+        def initialize(output)
+          @errors = []
+          @warnings = []
+          parse_output(output) if Array === output
+        end
 
-	private
-	def parse_output(output)
-	  output.each do |line|
-	    if line =~ ERROR_LINE
-	      error = $1
-	      next if SKIP_ERRORS.any? { |skip| error =~ skip }
-	      errors << create_message(error)
-	    elsif line =~ WARNING_LINE
-	      warnings << create_message($1)
-	    end
-	  end
+        private
+        def parse_output(output)
+          output.each do |line|
+            if line =~ ERROR_LINE
+              error = $1
+              next if SKIP_ERRORS.any? { |skip| error =~ skip }
+              errors << create_message(error)
+            elsif line =~ WARNING_LINE
+              warnings << create_message($1)
+            end
+          end
 
-          # Unique messages only. The block form of uniq() not available on Ruby < 1.9.2
+          # Unique messages only. The block form of uniq() is not available on Ruby < 1.9.2
           [errors, warnings].each do |e|
-            e.replace(e.inject({}) do |uniq, x| 
-              uniq[x.message] = x
-              uniq
-            end.values)
+            next if e.empty?
+            uniq = {}
+            e.replace(e.select { |m| uniq.include?(m.message) ? false : uniq[m.message] = true })
           end
-	end
+        end
 
-	def create_message(line)          
-	  case line
-	  when /^(?:ERROR|WARNING)\s+ITMS-(\d+):\s+(.+)/
-	    code = $1
-	    message = $2
-	  when /(.+)\s+\((\d+)\)$/,
+        def create_message(line)
+          case line
+          when /^(?:ERROR|WARNING)\s+ITMS-(\d+):\s+(.+)/
+            code = $1
+            message = $2
+          when /(.+)\s+\((\d+)\)$/,
                # Is this correct?
-	       /(.+)\s+errorCode\s+=\s+\((\d+)\)$/
-	    message = $1
-	    code = $2
-	  else
-	    message = line
-	    code = nil
-	  end
+               /(.+)\s+errorCode\s+=\s+\((\d+)\)$/
+            message = $1
+            code = $2
+          else
+            message = line
+            code = nil
+          end
 
-	  message.gsub! /^"/, ""
+          message.gsub! /^"/, ""
           message.gsub! /"(?: at .+)?$/, ""
 
-	  TransporterMessage.new(message, code ? code.to_i : nil)
-	end
+          TransporterMessage.new(message, code ? code.to_i : nil)
+        end
       end
     end
   end

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

@@ -1,4 +1,5 @@
 require "childprocess"
+require "itunes/store/transporter/errors"
 
 module ITunes
   module Store
@@ -35,6 +36,8 @@ module ITunes
         end
         
         def exec(argv, &block)
+          raise ArgumentError, "block required" unless block_given?
+
           begin 
             process = ChildProcess.build(path, *argv)
             
@@ -54,7 +57,7 @@ module ITunes
 
             poll(stdout[0], stderr[0], &block)          
           rescue ChildProcess::Error, SystemCallError => e
-            raise ITunes::Store::Transporter::TransporterError, e.message
+            raise TransporterError, e.message
           ensure
             process.wait if process.alive?
             [ stdout, stderr ].flatten.each { |io| io.close if !io.closed? }
@@ -68,6 +71,7 @@ module ITunes
           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?

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

@@ -1,7 +1,7 @@
 module ITunes
   module Store
     class Transporter
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/command_spec.rb

@@ -3,12 +3,12 @@ require "stringio"
 
 shared_examples_for "a transporter option" do |option, expected|
   it "creates the correct command line argument" do
-    ITunes::Store::Transporter::Shell.any_instance.stub(:exec) { |*arg| arg.first.should include(*expected); 0 }
+    expect_shell_args(*expected)
     subject.run(options.merge(option))
   end
 end
 
-shared_examples_for "a vendor_id option" do 
+shared_examples_for "a vendor_id option" do
   it_should_behave_like "a transporter option", { :vendor_id => "vID" }, "-vendor_id", "vID"
 end
 
@@ -22,25 +22,25 @@ shared_examples_for "a transporter option that expects a directory" do |option,
       lambda { subject.run(options.merge(option => "__baaaaahd_directory__")) }.should raise_exception(ITunes::Store::Transporter::OptionError, /does not exist/)
     end
   end
-end  
+end
 
 shared_examples_for "a boolean transporter option" do |option, expected|
-  context "when true" do 
+  context "when true" do
     it "creates the command line argument" do
-      ITunes::Store::Transporter::Shell.any_instance.stub(:exec) { |*arg| arg.first.should include(*expected); 0 }
+      expect_shell_args(*expected)
       subject.run(options.merge(option => true))
     end
   end
 
-  context "when false" do 
+  context "when false" do
     it "does not create the command line argument" do
-      ITunes::Store::Transporter::Shell.any_instance.stub(:exec) { |*arg| arg.first.should_not include(*expected); 0 }
+      ITunes::Store::Transporter::Shell.any_instance.should_receive(:exec) { |*arg| arg.first.should_not include(*expected); 0 }
       subject.run(options.merge(option => false))
     end
   end
 
-  context "when not boolean" do 
-    it "raises an OptionError" do 
+  context "when not boolean" do
+    it "raises an OptionError" do
       lambda { subject.run(options.merge(option => "sshaw")) }.should raise_exception(ITunes::Store::Transporter::OptionError, /does not accept/)
     end
   end
@@ -76,7 +76,7 @@ shared_examples_for "a subclass of Command::Base" do
     it "automatically sets NoPause to true" do
       ENV["PROGRAMFILES"] = "C:\\"
       shell = ITunes::Store::Transporter::Shell
-      shell.any_instance.stub(:exec) { |*arg| arg.first.should include("-WONoPause", "true"); 0 }
+      expect_shell_args("-WONoPause", "true")
       shell.stub(:windows? => true)
       subject.run(options)
     end
@@ -166,7 +166,7 @@ shared_examples_for "a subclass of Command::Base" do
           e.errors.should have(2).items
 
           # just check one
-          e.errors[0].should be_a(ITunes::Store::Transporter::TransporterMessage) 
+          e.errors[0].should be_a(ITunes::Store::Transporter::TransporterMessage)
           e.errors[0].code.should == 9000
           e.errors[0].message.should match("Your audio of screwed up!")
           e.errors[1].code.should == 4009
@@ -297,7 +297,7 @@ describe ITunes::Store::Transporter::Command::Upload do
     describe ":log_history" do
       it_should_behave_like "a transporter option that expects a directory", :log_history, "-loghistory"
     end
-   
+
     describe ":success" do
       it_should_behave_like "a transporter option that expects a directory", :success, "-success"
     end
@@ -321,27 +321,27 @@ describe ITunes::Store::Transporter::Command::Lookup do
   before(:each) do
     @tmpdir = Dir.mktmpdir
     Dir.stub(:mktmpdir => @tmpdir)
-    
+
     id = options[:vendor_id] || options[:apple_id]
     @package = File.join(@tmpdir, "#{id}.itmsp")
     Dir.mkdir(@package)
-    
+
     @metadata = "<x>Metadata</x>"
     File.open(File.join(@package, "metadata.xml"), "w") { |io| io.write(@metadata) }
-    
-    mock_output
   end
-  
+
   after(:each) { FileUtils.rm_rf(@tmpdir) }
-   
+
   describe "#run" do
-    context "when successful" do       
+    before { mock_output }
+
+    context "when successful" do
       it "returns the metadata and deletes the temp directory used to output the metadata" do
         subject.run(options).should == @metadata
         File.exists?(@tmpdir).should be_false
       end
 
-      context "when the metadata file was not created" do 
+      context "when the metadata file was not created" do
         before { FileUtils.rm_rf(@tmpdir) }
 
         it "raises a TransporterError" do
@@ -354,14 +354,14 @@ describe ITunes::Store::Transporter::Command::Lookup do
   # One of these two should be requied, but they should be mutually exclusive
   describe "options" do
     describe ":vendor_id" do
-      let(:options) { create_options({:vendor_id => "vID"}) }        
+      let(:options) { create_options({:vendor_id => "vID"}) }
       it_should_behave_like "a vendor_id option"
     end
 
     describe ":apple_id" do
-      let(:options) { create_options({:apple_id => "aID"}) }        
+      let(:options) { create_options({:apple_id => "aID"}) }
       it_should_behave_like "a transporter option", { :apple_id => "aID" }, "-apple_id", "aID"
-     end    
+     end
   end
 end
 
@@ -407,24 +407,45 @@ describe ITunes::Store::Transporter::Command::Status do
 
   describe "#run" do
     context "when successful" do
-      it "returns the status information for the package" do
-        mock_output(:stdout => "status.vendor_id_123123", :stderr => "stderr.info")
-        subject.run(options).should == {
-          :vendor_identifier => "123123",
-          :apple_identifier => "123123",
-          :itunesconnect_status => "Not ready for sale",
-          :upload_created =>  "2000-01-01 00:00:00",
-          :upload_state => "Uploaded",
-          :upload_state_id => "1",
-          :content_state => "Irie",
-          :content_state_id => "2"
-        }
+      context "with a single status" do
+        it "returns the status information for the package" do
+          mock_output(:stdout => "status.vendor_id_123123", :stderr => "stderr.info")
+          subject.run(options).should == {
+            :vendor_identifier => "123123",
+            :apple_identifier => "123123",
+            :itunesconnect_status => "Not ready for sale",
+            :status => [ { :upload_created =>  "2000-01-01 00:00:00",
+                           :upload_state => "Uploaded",
+                           :upload_state_id => "1",
+                           :content_state => "Irie",
+                           :content_state_id => "2" } ]
+          }
+        end
+      end
+
+      context "with multiple status" do
+        it "returns all the status information for the package" do
+          mock_output(:stdout => "status.vendor_id_789789", :stderr => "stderr.info")
+          subject.run(options).should == {
+            :vendor_identifier => "789789",
+            :status => [ { :upload_created =>  "2000-01-01 00:00:00",
+                           :upload_state => "Uploaded",
+                           :upload_state_id => "1",
+                           :content_state => "Irie",
+                           :content_state_id => "2" },
+                         { :upload_created =>  "2000-01-02 00:00:00",
+                           :upload_state => "Some Failure",
+                           :upload_state_id => "2",
+                           :content_state => "Still Irie",
+                           :content_state_id => "3" } ]
+          }
+        end
       end
     end
   end
 
-  describe "options" do 
-    describe ":vendor_id" do 
+  describe "options" do
+    describe ":vendor_id" do
       it_should_behave_like "a vendor_id option"
     end
   end
@@ -448,9 +469,9 @@ describe ITunes::Store::Transporter::Command::Verify do
         end
       end
 
-      # If no packages were verfied it exits with 0 but emits an error message
       context "with errors" do
         it "raises an ExecutionError" do
+          # If no packages were verfied it exits with 0 but emits an error message
           mock_output(:exit => 0, :stderr => "stderr.errors");
           lambda { subject.run(options) }.should raise_exception(ITunes::Store::Transporter::ExecutionError)
         end
@@ -460,7 +481,19 @@ describe ITunes::Store::Transporter::Command::Verify do
 
   describe "options" do
     describe ":verify_assets" do
-      it_should_behave_like "a boolean transporter option", :verify_assets, "-disableAssetVerification"
+      context "when true" do
+        it "does not create the command line argument" do
+          ITunes::Store::Transporter::Shell.any_instance.should_receive(:exec) { |*arg| arg.first.should_not include("-disableAssetVerification"); 0 }
+          subject.run(options.merge(:verify_assets => true))
+        end
+      end
+
+      context "when false" do
+        it "creates the command line argument" do
+          expect_shell_args("-disableAssetVerification")
+          subject.run(options.merge(:verify_assets => false))
+        end
+      end
     end
   end
 end