itunes_store_transporter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7127018124d73b10742187cbd8ca283b2d70fe6
-  data.tar.gz: 9967d8bab13f0c965e383522491227cf7bfac5e6
+  metadata.gz: 603cbf0b2fe54965a1fcd25315fc2434f9987188
+  data.tar.gz: 4c197138304f80f540f508c8a8f09910532ceef6
 SHA512:
-  metadata.gz: edef7e176540218a6b572e27c8f1a23dba40f51e2fbc7cc637f00db563033293fd38ad957957d386e08acdce8c14960078493fc85e4c89a7522e811d9a4972a3
-  data.tar.gz: caac988d22b3d8dc46ba05d7692c86eeb97790bda4f546a7f0562eeaec897f6746341e0e6e3cbb56fff046331e6da26256045cb0ff072edd4f927f5d2a1678e3
+  metadata.gz: 57b4de9c4cc1571829c9151ec91e8b0773d094299454252ff40d348faed32100d65e242a1dcd322c014347d4167e5c9a3f93a6373e3ba7f7e8578d1ebda769af
+  data.tar.gz: 812887659a510890d27f5e4a497b96463dca4ffe371e281e9be9b50a613e0bff3d2cd4a2df53eae8b82bd395ec4990f5240a6639b22b986efe58d975fb829809

data/Changes

@@ -1,3 +1,8 @@
+v0.1.3    2015-03-31
+--------------------
+Enhancements:
+* Add the :batch option to support batch operations (thanks to press9 media solutions berlin - press9.de)
+
 v0.1.2    2015-03-07
 --------------------
 Changes:

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/github/sshaw/itunes_store_transporter.png" />}[https://codeclimate.com/github/sshaw/itunes_store_transporter]
+{<img src="https://secure.travis-ci.org/sshaw/itunes_store_transporter.svg"/>}[http://travis-ci.org/sshaw/itunes_store_transporter]
+{<img src="https://codeclimate.com/github/sshaw/itunes_store_transporter.svg" />}[https://codeclimate.com/github/sshaw/itunes_store_transporter]
 
 Upload and manage your assets in the iTunes Store using the iTunes Store's Transporter (+iTMSTransporter+).
 

data/lib/itunes/store/transporter.rb

@@ -9,6 +9,7 @@ require "itunes/store/transporter/command/version"
 
 module ITunes
   module Store
+    # See ITunes::Store::Transporter::ITMSTransporter
     module Transporter
       def self.new(options = nil)
         ITMSTransporter.new(options)

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

@@ -43,6 +43,7 @@ module ITunes
           end
 
           protected
+
           attr :config
           attr :default_options
 
@@ -86,6 +87,8 @@ module ITunes
             options.on *SHORTNAME
           end
 
+          protected
+
           def create_transporter_options(optz)
             optz[:mode] = mode
             super
@@ -96,6 +99,41 @@ module ITunes
           end
         end
 
+        class BatchMode < Mode
+          BatchOption = Optout::Option.create(:package, "-f", :required => true, :validator => Optout::Dir.exists)
+          PackageOption = Optout::Option.create(:package, "-f", :required => true, :validator => Optout::Dir.exists.named(/\.itmsp\z/))
+
+          protected
+
+          def create_transporter_options(optz)
+            batch   = optz.delete(:batch)
+            package = optz.delete(:package)
+
+            argv = super
+
+            klass = if batch == true
+              BatchOption
+            else
+              if package !~ /\.itmsp\z/
+                warn "WARNING: In version 0.3.0 directories without an itmsp extension be treated as a batch upload. " \
+                     "This will result in the processing of all child directories with an itmsp extension. " \
+                     "To prevent this behavior in 0.3.0 you must set the :batch option to false"
+              end
+
+              PackageOption
+            end
+
+            opt = klass.new(package)
+
+            begin
+              opt.validate!
+            rescue Optout::OptionError => e
+              raise OptionError, e.message
+            end
+
+            argv.concat(opt.to_a)
+          end
+        end
       end
     end
   end

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

@@ -9,12 +9,12 @@ module ITunes
       module Command
 
         ##
-        # Retrieve the metadata for a previously delivered package.  
+        # Retrieve the metadata for a previously delivered package.
         #
         class Lookup < Mode
           def initialize(*config)
             super
-            # These 2 are mutually exclusive, and one is required. 
+            # These 2 are mutually exclusive, and one is required.
             # Optout has no way to denote this
             options.on *VENDOR_ID
             options.on *APPLE_ID
@@ -23,12 +23,13 @@ module ITunes
 
           def run(options = {})
             options[:destination] = Dir.mktmpdir
-            super 
+            super
           ensure
             FileUtils.rm_rf(options[:destination]) if options[:destination]
           end
 
           protected
+
           def handle_success(stdout_lines, stderr_lines, options)
             id = options[:apple_id] || options[:vendor_id]
             path = File.join(options[:destination], "#{id}.itmsp", "metadata.xml")
@@ -37,8 +38,8 @@ module ITunes
               raise TransporterError, "No metadata file exists at #{path}"
             end
 
-            begin 
-              metadata = File.read(path) 
+            begin
+              metadata = File.read(path)
             rescue StandardError => e
               raise TransporterError, "Failed to read metadata file #{path}: #{e}"
             end

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

@@ -11,9 +11,8 @@ module ITunes
           SHORTNAME   = [ :shortname, "-s", /\w/ ]
           TRANSPORT   = [ :transport, "-t", %w|Aspera Signiant DAV| ]
           SUCCESS     = [ :success, "-success", Optout::Dir.exists ]
-          FAILURE     = [ :failure, "-failure", Optout::Dir.exists ]         
-          PACKAGE     = [ :package, "-f", Optout::Dir.exists.named(/\.itmsp\z/), { :required => true } ]
-          DESTINATION = [ :destination, "-destination" ]          
+          FAILURE     = [ :failure, "-failure", Optout::Dir.exists ]
+          DESTINATION = [ :destination, "-destination" ]
         end
       end
     end

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

@@ -9,10 +9,9 @@ module ITunes
         ##
         # Upload a package to the iTunes Store
         #
-        class Upload < Mode
+        class Upload < BatchMode
           def initialize(*config)
             super
-            options.on *PACKAGE
             options.on *TRANSPORT
             options.on *SUCCESS
             options.on *FAILURE

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

@@ -11,11 +11,9 @@ module ITunes
         ##
         # Validate the contents of a package's metadata and assets.
         #
-
-        class Verify < Mode
+        class Verify < BatchMode
           def initialize(*config)
             super
-            options.on *PACKAGE
             options.on :verify_assets, "-disableAssetVerification", Optout::Boolean  # If false verify MD only no assets
           end
 

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

@@ -143,6 +143,7 @@ module ITunes
         # [:delete (Boolean)] Delete the package if the upload succeeds. Defaults to +false+.
         # [:log_history (String)] Write an +iTMSTransporter+ log to this directory. Off by default.
         # [:streams (Integer)] Number of data streams to use. Optional, only used with +Signiant+
+        # [:batch (Boolean)] Allow batch uploads if +package+ is a regular directory. Optional, defaults to +false+ but <b>will default to +true+ in <code>v0.3.0</code></b>.
         #
         # === Errors
         #
@@ -169,6 +170,7 @@ module ITunes
         #
         # === Options
         #
+        # [:batch (Boolean)] Allow batch verification if +package+ is a regular directory. Optional, defaults to +false+ but <b>will default to +true+ in <code>v0.3.0</code></b>.
         # [:verify_assets (Boolean)] If false the assets will not be verified. Defaults to +true+.
         #
         # === Errors

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

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

data/spec/command_spec.rb

@@ -195,6 +195,7 @@ shared_examples_for "a transporter mode" do
 end
 
 shared_examples_for "a command that requires a package argument" do
+  # TODO: it_should_behave_like "a transporter option", {:package => "xxx"}, "f", "xxx"
   it_should_behave_like "a required option", :package
 
   context "when a directory" do
@@ -208,16 +209,48 @@ shared_examples_for "a command that requires a package argument" do
 
     it "must end in .itmsp" do
       options = create_options(:package => @tmpdir)
-      lambda { subject.run(options) }.should raise_error(ITunes::Store::Transporter::OptionError, /must match/i)
+      expect { subject.run(options) }.to raise_error(ITunes::Store::Transporter::OptionError, /must match/i)
 
       mock_output(:exit => 0)
       options = create_options(:package => @pkgdir)
-      lambda { subject.run(options) }.should_not raise_error
+      expect { subject.run(options) }.not_to raise_error
     end
 
     it "must exist" do
       options = create_options(:package => File.join(@tmpdir, "badpkg.itmsp"))
-      lambda { subject.run(options) }.should raise_error(ITunes::Store::Transporter::OptionError, /does not exist/i)
+      expect { subject.run(options) }.to raise_error(ITunes::Store::Transporter::OptionError, /does not exist/i)
+    end
+
+    context "when it does not end in .itmsp" do
+      before do
+        @realerr = $stderr
+        $stderr = StringIO.new
+      end
+
+      after { $stderr = @realerr }
+
+      it "prints a deprecation warning to stderr" do
+        options = create_options(:package => @tmpdir)
+        subject.run(options) rescue nil
+        expect($stderr.string).to match(/^WARNING:/)
+      end
+
+      context "and :batch is true" do
+        before do
+          mock_output
+          @options = create_options(:package => @tmpdir, :batch => true)
+        end
+
+        it "does not raise an exception" do
+          expect { subject.run(@options) }.to_not raise_error
+        end
+
+        it "does not print a deprecation warning to stderr" do
+          options = create_options(:package => @tmpdir)
+          subject.run(@options)
+          expect($stderr.string).not_to match(/^WARNING:/)
+        end
+      end
     end
   end
 

data/spec/transporter_spec.rb

@@ -10,8 +10,8 @@ shared_examples_for "a transporter method" do
       :print_stdout => true
     }
 
-    s = stub(command)
-    s.should_receive(:run)
+    s = double(command)
+    allow(s).to receive(:run)
 
     klass = ITunes::Store::Transporter::Command.const_get(command)
     klass.should_receive(:new).with(config, defaults).and_return(s)
@@ -20,7 +20,7 @@ shared_examples_for "a transporter method" do
   end
 end
 
-shared_examples_for "a transporter method without a package argument" do 
+shared_examples_for "a transporter method without a package argument" do
   it_behaves_like "a transporter method"
 
   it "executes the underlying command" do
@@ -29,7 +29,7 @@ shared_examples_for "a transporter method without a package argument" do
   end
 end
 
-shared_examples_for "a transporter method with a package argument" do 
+shared_examples_for "a transporter method with a package argument" do
   it_behaves_like "a transporter method"
 
   it "executes the underlying command" do
@@ -94,13 +94,13 @@ describe ITunes::Store::Transporter::ITMSTransporter do
     let(:method) { :verify }
     let(:command) { "Verify" }
 
-    it_behaves_like "a transporter method with a package argument"  
+    it_behaves_like "a transporter method with a package argument"
   end
 
   describe "#version" do
     let(:method) { :version }
     let(:command) { "Version" }
 
-    it_behaves_like "a transporter method without a package argument"  
+    it_behaves_like "a transporter method without a package argument"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes_store_transporter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Upload and manage your assets in the iTunes Store using the iTunes Store's