marathon-api 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec756f5d2eb488416f50de1d83bb181091dd46b
-  data.tar.gz: 6ea47852e64d444617cf19028c9aff59cedd845e
+  metadata.gz: 9654134c87faac00b19343eb041d4c7be5bafe14
+  data.tar.gz: d81dc5a1dc3955ec339d32cfe39f1e18f85cd876
 SHA512:
-  metadata.gz: 3c49001387c2b89593d22021c8f1522bbf8477e36a6072063ee8fcaa4eac7c356c3492fd2e7edbe1e88797bfefe678ece2ee6428e1fa95a1be51bfa82f4f41ba
-  data.tar.gz: a3ec6efa4bb735d095f5da81c550291bc865d7aef29025040b0658592b6c21e76558d1a72c9d5d339fc5335569db4c969da5975b8f4797ef78c24acbe5c49253
+  metadata.gz: 4f1233cc97367d154e742a0d72fb333f117e123eefc7145be68f740bd4733e8396584f6db6a97b0d5a1d21d7a873fb2e4a3e79ddd9f0776be572b02d67c00af4
+  data.tar.gz: 932fb164588d973f55ea9e0d472fc5a50ade3014d8fadbb3deaaae8ad1b604e015b61959ee1c8b33b97f3d42f9ba8a040b5baeff741c7d377bc0e4b089d0b455

data/bin/marathon

@@ -4,7 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'maratho
 require 'trollop'
 require 'json'
 
-SUB_COMMANDS = %w[kill kill_tasks start scale list list_tasks]
+SUB_COMMANDS = %w[kill kill_tasks start scale rollback list list_tasks]
 ATTRIBUTES = [:id, :cmd, :executor, :instances, :cpus, :mem, :uris]
 DEFAULT_APP_OPTS = {
         :instances => 1,
@@ -121,6 +121,23 @@ def subcmd_kill_tasks(cmd_opts)
   print_tasks(tasks)
 end
 
+def subcmd_rollback(cmd_opts)
+  app = Marathon::App.get(cmd_opts[:id])
+  # Get current versions
+  versions = app.versions
+  # Retrieve N-1 version if none given
+  target = cmd_opts[:version_id] ? cmd_opts[:version_id] : versions[1]
+  # Deploy the target version of the app
+  puts "Rollback app '#{app.id}' from #{versions[0]} to #{target}"
+  app.roll_back!(target, cmd_opts[:force])
+rescue Marathon::Error::MarathonError => e
+  puts "#{e.class}: #{e.message}"
+  exit 1
+rescue TimeoutError => e
+  puts "Deployment took too long"
+  exit 1
+end
+
 # parse global options
 def parse_global_opts
   global_opts = Trollop.options do
@@ -134,6 +151,7 @@ Available commands:
   kill_tasks  Kill a task or tasks belonging to a specified app.
   list        Show a list of running apps and their options.
   list_tasks  Show a list of an app's running tasks.
+  rollback    Rollback an app to a specific version.
   scale       Scale the number of app instances.
   start       Start a new app.
 
@@ -201,6 +219,12 @@ def parse_subcmd_opts(cmd)
         opt :sync, 'Wait for the deployment to finish', :short => '-s'
         opt :timeout, 'Timout for sync call in seconds (default 60).', :type => Integer, :short => '-t'
       end
+    when 'rollback'
+      Trollop.options do
+        opt :id, 'A unique identifier for the app.', :short => '-i', :type => String, :required => true
+        opt :version_id, 'A version identifier.', :short => '-v', :type => String, :default => nil
+        opt :force, 'The current deployment can be overridden by setting the `force`.', :short => '-f'
+      end
     when 'kill'
       Trollop.options do
         opt :id, 'A unique identifier for the app.', :short => '-i', :type => String, :required => true
@@ -238,6 +262,8 @@ def run_subcmd(cmd, cmd_opts)
     subcmd_list_tasks(cmd_opts)
   when 'kill_tasks'
     subcmd_kill_tasks(cmd_opts)
+  when 'rollback'
+    subcmd_rollback(cmd_opts)
   else
     Trollop.die "unknown subcommand #{cmd.inspect}"
   end

data/lib/marathon/container_volume.rb

@@ -16,8 +16,6 @@ class Marathon::ContainerVolume < Marathon::Base
     raise Marathon::Error::ArgumentError, 'containerPath must be an absolute path' \
       unless Pathname.new(containerPath).absolute?
     raise Marathon::Error::ArgumentError, 'hostPath must not be nil' unless hostPath
-    raise Marathon::Error::ArgumentError, 'hostPath must be an absolute path' \
-      unless Pathname.new(hostPath).absolute?
   end
 
   def to_pretty_s
@@ -28,4 +26,4 @@ class Marathon::ContainerVolume < Marathon::Base
     "Marathon::ContainerVolume { :containerPath => #{containerPath} :hostPath => #{hostPath} :mode => #{mode} }"
   end
 
-end
+end

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

data/marathon-api.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'vcr', '>= 2.7.0'
-  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'webmock', '< 2.0.0'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'simplecov'

data/spec/marathon/container_volume_spec.rb

@@ -19,12 +19,8 @@ describe Marathon::ContainerVolume do
     it 'should fail with invalid path' do
       expect { subject.new(:hostPath => '/') }
         .to raise_error(Marathon::Error::ArgumentError, /containerPath .* not be nil/)
-      expect { subject.new(:containerPath => 'foo', :hostPath => '/') }
-        .to raise_error(Marathon::Error::ArgumentError, /containerPath .* absolute path/)
       expect { subject.new(:containerPath => '/') }
         .to raise_error(Marathon::Error::ArgumentError, /hostPath .* not be nil/)
-      expect { subject.new(:containerPath => '/', :hostPath => 'foo') }
-        .to raise_error(Marathon::Error::ArgumentError, /hostPath .* absolute path/)
     end
   end
 
@@ -47,4 +43,4 @@ describe Marathon::ContainerVolume do
     its(:to_pretty_s) { should == '/data:/var/opt/foo:RO' }
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -112,16 +112,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement