haile 0.4.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a16daa6bbc6b67d20a9e756a6aeb7baf64430be
-  data.tar.gz: 0eadc9c22aca25c4b730cdf087e75b604743fffc
+  metadata.gz: db770953f74bb5bcb8041ce341cdefc7e2fd2669
+  data.tar.gz: d098d73d67bd058ad36451cb2ffb65fb8dfe03c7
 SHA512:
-  metadata.gz: 8c828cf52e75b8e988e0ded8c44df36ef32795bf669a6bf9a21a437ad7d0ef6efff174b103443dd0bd05274aea41559e4f8ac369fbb88ded993c7c67a3eac650
-  data.tar.gz: 4100fb8fcffaaaee8e8a737f9665c11d840daa5a9a37b5d548fc98ca854a8f5d4789d79869847e03deed094df5c575a59772e22327179066a99b556ed9a236c8
+  metadata.gz: 0852eefb5573646bde1b98b0b323a1ccc5602f124de955aaf6a098a3166d1cf0e902cf65e79bba8aa0c7d8329b007cc585ffa9b34b80ced0718947f729176fcf
+  data.tar.gz: 5a478cd0deeff304daa58aac98cf8dcee85c781ff82c5184e47526f596eefbc2043d0d033aa68bb91b412ccef3c968e267b909ff37111f25995259bd49930b74

data/bin/haile

@@ -3,7 +3,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'haile'))
 require 'trollop'
 
-SUB_COMMANDS = %w[endpoints kill kill_tasks start scale list list_tasks search docker_deploy]
+SUB_COMMANDS = %w[endpoints kill kill_tasks upstart scale list list_tasks search docker_deploy]
 
 global_opts = Trollop.options do
   version Haile::VERSION
@@ -12,14 +12,14 @@ Usage: haile [global options] [command] [options]
 
 Available commands:
 
-  kill           Kill an app and remove it from Marathon.
-  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.
-  scale          Scale the number of app instances.
-  search         Search the current list of apps.
-  start          Start a new app.
-  docker_deploy  Update the docker image tag of an app.
+  kill             Kill an app and remove it from Marathon.
+  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.
+  scale            Scale the number of app instances.
+  search           Search the current list of apps.
+  upstart          Start a new app, or update existing app from a config file
+  docker_deploy    Update the docker image tag of an app.
 
 Global options:
 EOS
@@ -48,17 +48,9 @@ cmd_opts = case cmd
     Trollop.options do
       opt :id, 'A unique identifier for the app.', :short => '-i', :required => true, :type => String
     end
-  when 'start'
+  when 'upstart'
     Trollop.options do
-      opt :id, 'A unique identifier for the app.', :required => true, :short => '-i', :type => String
-      opt :command, 'The command to start the app.', :short => '-C', :type => String
-      opt :executor, 'The mesos executor to be used to launch the app.', :short => '-X', :type => String
-      opt :num_instances, 'The number of instances to run (default 1).', :default => 1, :short => '-n'
-      opt :cpus, 'The number of CPUs to give to this app, can be a fraction (default 1.0).', :default => 1.0, :short => '-c'
-      opt :mem, 'The memory limit for this app, in MB, can be a fraction (default 10.0).', :default => 10.0, :short => '-m'
-      opt :uri, 'URIs to download and unpack into the working directory.', :short => '-u', :type => :strings
-      opt :env, 'Environment variables to add to the process, as NAME=VALUE.', :short => '-e', :type => :strings
-      opt :constraint, 'Placement constraint for tasks, e.g. hostname:UNIQUE or rackid:CLUSTER', :type => :strings
+      opt :config, 'The JSON config file for this app.', :required => true, :short => '-c', :type => String
     end
   when 'scale'
     Trollop.options do
@@ -124,19 +116,8 @@ end
 case cmd
 when 'endpoints'
   puts haile.endpoints(cmd_opts[:id]).parsed_response
-when 'start'
-  app_opts = {
-    :instances => cmd_opts[:num_instances] || 1,
-    :uris => cmd_opts[:uri] || [],
-    :cmd => cmd_opts[:command],
-    :env => cmd_opts[:env].nil? ? {} : Hash[cmd_opts[:env].map { |e| e.split('=', 2) }],
-    :cpus => cmd_opts[:cpus] || 1.0,
-    :mem => cmd_opts[:mem] || 10.0,
-    :constraints => (cmd_opts[:constraint] || []).map { |c| c.split(':') }
-  }
-  app_opts[:executor] = cmd_opts[:executor] unless cmd_opts[:executor] == nil
-  puts "Starting app '#{cmd_opts[:id]}'"
-  puts haile.start(cmd_opts[:id], app_opts)
+when 'upstart'
+  haile.upstart(cmd_opts[:config])
 when 'scale'
   puts "Scaling app '#{cmd_opts[:id]}' to #{cmd_opts[:num_instances]} instances"
   res = haile.scale(cmd_opts[:id], cmd_opts[:num_instances])

data/haile.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "trollop", "~> 2.0"
   spec.add_dependency "httparty", "~> 0.11"
   spec.add_dependency "multi_json", "~> 1.8"
+  spec.add_dependency 'colorize', '~> 0.7.7', '>= 0.7.7'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 0"

data/lib/haile/client.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'multi_json'
+require 'colorize'
 
 module Haile
   class Client
@@ -60,10 +61,17 @@ module Haile
       wrap_request(:get, url)
     end
 
-    def start(id, opts)
-      body = opts.dup
-      body[:id] = id
-      wrap_request(:post, '/v2/apps/', :body => body)
+    def upstart(config_file)
+      body = JSON.parse(open(config_file).read)
+      id = body['id']
+      app = wrap_request(:get, "/v2/apps/#{id}").parsed_response['app']
+      if !!app
+        puts "Updating app #{id}...".green
+        wrap_request(:put, "/v2/apps/#{id}", :body => body)
+      else
+        puts "Starting app #{id}...".blue
+        wrap_request(:post, '/v2/apps/', :body => body)
+      end
     end
 
     def docker_deploy(id, image)
@@ -82,8 +90,7 @@ module Haile
               "with a docker image."
         return Haile::Response.error(msg)
       end
-      resp = wrap_request(:put, "/v2/apps/#{id}", :body => app)
-      puts "#{id}: #{resp.to_s}"
+      wrap_request(:put, "/v2/apps/#{id}", :body => app)
     end
 
     def scale(id, num_instances)

data/lib/haile/version.rb

@@ -1,3 +1,3 @@
 module Haile
-  VERSION = "0.4.3"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haile
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Tobi Knaup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -53,6 +53,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby client for Marathon REST API