orch 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fc678adcfcacd47d4c3424fffae37cfba36f7f1
-  data.tar.gz: deba3fb34b70a3b486c400b71ff395b869fa0a9a
+  metadata.gz: 92d6e7c901a8497b6b574287ef7060ee8f9a178f
+  data.tar.gz: 0c4ca4a8ef6895df3f06b5e6e05b9458c4102f8b
 SHA512:
-  metadata.gz: bf766eea2fd37950ac0fa9fcbe2528e4b51748570f0ae104cc73796bc667403d994e64e310c964fd882bfb2adca49aaaaefe4e412e39df7bf2c7ddcf08ef6b95
-  data.tar.gz: 5f1e9ce4837fb1a4ca65cefc4fc12005ffb0d6f94d98a3f58c45b059b972725120310374df0cc02cc7bcce63f447e7e1cfe06e5938bc52257c6d55aa8bccca08
+  metadata.gz: 27ae0267fff9f2c200760596168ff9268a66bdafdfcf4b2079b0262b9db765157e0e3cff27617bd143aec194e2436da87459cbd1e310bc0c645fc8600066976c
+  data.tar.gz: 5bb49d8171aa924f015c048b2bb40bb472ac3ea786a9579c8c61e7d7bf5bcc29692809fff2fcdf8ae6367b65890abcda7753afbf9286c9c662ecc293f39e37e1

data/README.md

@@ -24,14 +24,14 @@ The orch Yaml format is really a wrapper for multiple Marathon or Chronos job de
 
 The basic orch syntax is as follows:
 ```
-version: alpha1
+version: 1.0
 applications:
   - kind: Chronos
     chronos_spec:
       ...
 ```
 
-The **version:** field must currently always be alpha1.  Eventually, this tool may need to support a revised format and this can be used to support multiple versions.
+The **version:** field must currently always be 1.0.  Eventually, this tool may need to support a revised format and this can be used to support multiple versions.
 
 The **applications:** field contains an array of Chronos or Marathon configurations.  Each array must have a **kind:** field with a value of _Chronos_ or _Marathon_ which simply tells orch what type of config this is.  Depending on the value of **kind:** a field of **chronos_spec:** or **marathon_spec:** is also required.
 
@@ -58,7 +58,7 @@ This example will define an environment variable named **DEPLOY_ENV**.  (You can
 
 You then would need to specify that variable in your application sections like this:
 ```
-version: alpha1
+version: 1.0
 deploy_vars:
   DEPLOY_ENV:
     - dev
@@ -86,7 +86,7 @@ Chronos and Marathon use different syntx to specify environment variables.  Also
 
 The env field could be used at the top level of the spec to be used across all applications in the spec:
 ```
-version: alpha1
+version: 1.0
 env:
   GOOGLE_URL: http://www.google.com
   YP_URL: http://www.yp.com
@@ -96,7 +96,7 @@ env:
 
 Or you can also specify it at the application level as an alternative syntax to specifying it in the *marathon_spec:* or *chronos_spec:* sections - like this:
 ```
-version: alpha1
+version: 1.0
 env:
   GOOGLE_URL: http://www.google.com
   YP_URL: http://www.yp.com
@@ -109,7 +109,7 @@ env:
         ...
 ```
 
-Lower level definitions of an env var will supeceed higher level version.  That is if you specify an env value in the *marathon_spec* or *chronos_spec* level it will override anything set at the *app* or *orch* level.
+Lower level definitions of an env var will superceed a higher level version.  That is if you specify an env value in the *marathon_spec* or *chronos_spec* level it will override anything set at the *app* or *orch* level.
 ### Yaml anchors and aliases
 
 The nice thing about using Yaml as the spec format is the ability to use Yaml's anchors (&) and alias (*) syntax.  This allows you to specify sections of your configuration that can be reused across multiple jobs.  Typically if you have a job for multiple deployment environments you what them all to have the same spec - except perhaps override one or two things.  (Like an envionment value or the docker image.)
@@ -133,7 +133,7 @@ TODO: finish this section
 
 Orch provides a way to also configure your Bamboo server from your orch config.  Here is an example:
 ```
-version: alpha1
+version: 1.0
 applications:
   - kind: Marathon
     marathon_spec:
@@ -150,12 +150,35 @@ Note: you will also need to set the **bamboo_url:** feild of your configutation.
 
 ## Configuration Options
 
-Run the following command to interactively create a config file.
+There are a few ways to configure orch to know about the urls for various mesos services.  These provide options
+for various automation and deployment scenerios.
+
+The first option is to set up a config file with the urls for your Mesos frameworks.  Run the following command to interactively create a config file.
 ```
 $> orch config
 ```
 
-The file ~/.orch/config.yaml would contain values for "chronos_url" and "marathon_url".  You can also pass --chronos_url or --marathon_url options to the "orch deploy" command to override what is in the config file.
+The file ~/.orch/config.yaml would contain values for "chronos_url" and "marathon_url".
+
+You can also specify the framework urls directly in your configuration.  There are two places in the specification that could the url can be set.  You would use the keys chronos_url:, marathon_url: or bamboo_url:
+Here is an example:
+```
+version: 1.0
+config:
+  chronos_url: http://chronos.mycompany.com:8080
+applications:
+  - kind: Marathon
+    marathon_url: http://marathon.mycompany.com
+    marathon_spec:
+      ...
+    bamboo_url: http://bamboo.mycompany.com
+    bamboo_spec:
+      acl: "hdr(host) -i web.example.com"
+```
+
+A url in the config section would apply to all applications in the specification.  A url at the application level would superceed any definitions in the config section.  This can be useful if you have a specification that needs to deploy to multiple clusters such as in a multi-datacenter scenerio.  Any urls specified in a YAML specification would override those in the .orch/config.yaml file.
+
+Finally, you can also pass --chronos_url or --marathon_url options to the "orch deploy" command to override all other specifications.  You may want to use this option in automated deployment scenerios where you want to manage were things get deployed in another system.
 
 ## Examples
 

data/examples/bamboo-ex.yml

@@ -11,16 +11,16 @@ default_job: &DEFAULT_JOB
     container: &DEFAULT_CONTAINER
       type: "DOCKER"
       docker: &DEFAULT_DOCKER
-        image: "nginx"
+        image: "ypengineering/milieu"
         network: "BRIDGE"
         portMappings: 
           - 
             containerPort: 80
             hostPort: 0
             protocol: "tcp"
-        forcePullImage: false
+        forcePullImage: true
 
-version: alpha1
+version: 1.0
 deploy_vars:
   DEPLOY_ENV:
     - dev

data/examples/env-chronos.yml

@@ -19,7 +19,7 @@ default_job: &DEFAULT_JOB
         value: "/var/{{DEPLOY_ENV}}"
     command: "echo \"log here: $LOG_LOCATION\"; echo \"ENV: $DEPLOY_ENV\";sleep 10; echo bye"
 
-version: alpha1
+version: 1.0
 deploy_vars:
   DEPLOY_ENV:
     - dev

data/examples/env-marathon.yml

@@ -18,7 +18,7 @@ default_job: &DEFAULT_JOB
             protocol: "tcp"
         forcePullImage: false
 
-version: alpha1
+version: 1.0
 deploy_vars:
   DEPLOY_ENV:
     - dev

data/examples/simple-chronos.yml

@@ -1,4 +1,4 @@
-version: alpha1
+version: 1.0
 applications:
   - kind: Chronos
     chronos_spec:

data/examples/simple-marathon.yml

@@ -1,4 +1,4 @@
-version: alpha1
+version: 1.0
 applications:
   - kind: Marathon
     DEPLOY_ENV: dev

data/lib/bamboo.rb

@@ -14,11 +14,14 @@ end
 module Orch
   class Bamboo
     def initialize(options)
-      @config = Orch::Config.new(options)
     end
 
-    def deploy(app_id, bamboo_spec)
-      uri = URI(@config.bamboo_url)
+    def deploy(url, app_id, bamboo_spec)
+      if url.nil?
+        exit_with_msg "bamboo_url not defined"
+      end
+
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
@@ -30,7 +33,11 @@ module Orch
   # curl -i -X PUT -d '{"id":"/ExampleAppGroup/app1", "acl":"path_beg -i /group/app-1"}' http://localhost:8000/api/services//ExampleAppGroup/app1
 # {"/adam-web-dev":{"Id":"/adam-web-dev","Acl":"hdr(host) -i adam-web-dev.ypec.int.yp.com"
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.put("/api/services/#{app_id}", bamboo_json.to_json, json_headers)
+      begin
+        response = http.put("/api/services/#{app_id}", bamboo_json.to_json, json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code == 200.to_s
         puts "successfully created bamboo spec for marathon job: #{app_id}"
@@ -41,37 +48,47 @@ module Orch
       return response
     end
 
-    def delete(app_id)
-      uri = URI(@config.chronos_url)
+    def delete(url, app_id)
+      if url.nil?
+        exit_with_msg "bamboo_url not defined"
+      end
+
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       puts "curl -i -X DELETE #{uri}/api/services/#{app_id}"
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.delete("/api/services/#{app_id}", json_headers)
+      begin
+        response = http.delete("/api/services/#{app_id}", json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code != 200.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"
       end
 
-      # TODO: handle error codes better?
-
       return response
     end
 
-    def verify(app_id, spec)
-      if @config.check_for_bamboo_url == false
+    def verify(url, app_id, spec)
+      if url.nil?
         puts "no bamboo_url - can not verify with server"
         return
       end
 
-      uri = URI(@config.bamboo_url)
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       # TODO: will this work or do I need to parse through all services like chronos
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.get("/api/services", json_headers)
+      begin
+        response = http.get("/api/services", json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code != 200.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"

data/lib/chronos.rb

@@ -14,12 +14,14 @@ end
 module Orch
   class Chronos
     def initialize(options)
-      # TODO: get chronos and marathon urls from diffferent ways: param, env, .config
-      @config = Orch::Config.new(options)
     end
 
-    def deploy(json_payload)
-      uri = URI(@config.chronos_url)
+    def deploy(url, json_payload)
+      if url.nil?
+        exit_with_msg "chronos_url not defined"
+      end
+
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
@@ -27,54 +29,65 @@ module Orch
       path = "/scheduler/iso8601" unless json_payload["schedule"].nil?
       path = "/scheduler/dependency" unless json_payload["parents"].nil?
       if path.nil?
-        puts "neither schedule nor parents fields defined for Chronos job"
-        exit 1
+        exit_with_msg "neither schedule nor parents fields defined for Chronos job"
       end
 
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.post(path, json_payload, json_headers)
+      begin
+        response = http.post(path, json_payload, json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code != 204.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"
       end
 
-      # TODO: handle error codes better?
-
       return response
     end
 
-    def delete(name)
-      uri = URI(@config.chronos_url)
+    def delete(url, name)
+      if url.nil?
+        exit_with_msg "chronos_url not defined"
+      end
+
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       # curl -L -X DELETE chronos-node:8080/scheduler/job/request_event_counter_hourly
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.delete("/scheduler/job/#{name}", json_headers)
+      begin
+        response = http.delete("/scheduler/job/#{name}", json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code != 204.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"
       end
 
-      # TODO: handle error codes better?
-
       return response
     end
 
-    def verify(json_payload)
-      if @config.check_for_chronos_url == false
+    def verify(url, json_payload)
+      if url.nil?
         puts "no chronos_url - can not verify with server"
         return
       end
 
       spec = Hashie::Mash.new(JSON.parse(json_payload))
 
-      uri = URI(@config.chronos_url)
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.get("/scheduler/jobs/search?name=#{spec.name}", json_headers)
+      begin
+        response = http.get("/scheduler/jobs/search?name=#{spec.name}", json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code != 200.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"
@@ -97,8 +110,6 @@ module Orch
         foundDiffs = true 
       end
 
-      # TODO: handle error codes better?
-
       return foundDiffs
     end
 
@@ -114,9 +125,9 @@ module Orch
         end
         if spec[key].is_a?(Array)
           if spec[key].length != job[key].length
-            printf "difference for field: #{key} - length of array is different\n"
-            printf "    spec:   #{spec[key].to_json}\n"
-            printf "    server: #{job[key].to_json}\n"
+            printf("difference for field: %s - length of array is different\n", key)
+            printf("    spec:   %s\n", spec[key].to_json)
+            printf("    server: %s\n", job[key].to_json)
             foundDiff = true
             next
           end
@@ -140,9 +151,9 @@ module Orch
           if foundDiff == false
             puts "Differences found in job"
           end
-          printf "difference for field: #{key}\n"
-          printf "    spec:   #{specVal}\n"
-          printf "    server: #{jobVal}\n"
+          printf("difference for field: %s\n", key)
+          printf("    spec:   %s\n", specVal)
+          printf("    server: %s\n", jobVal)
           foundDiff = true
         end
       end

data/lib/config.rb

@@ -16,73 +16,79 @@ module Orch
       end
     end
 
-    def check_for_chronos_url
-      if (!  @options.has_key?("chronos_url")) && (@APP_CONFIG.nil? || @APP_CONFIG["chronos_url"].nil?)
-        return false
-      else
-        return true
-      end
-    end
-
-    def check_for_marathon_url
-      if (!  @options.has_key?("marathon_url")) && (@APP_CONFIG.nil? || @APP_CONFIG["marathon_url"].nil?)
-        return false
-      else
-        return true
+    def chronos_url(spec, app)
+      if @options.has_key?("chronos_url")
+        url = @options["chronos_url"]
+        return url
       end
-    end
 
-    def check_for_bamboo_url
-      if (!  @options.has_key?("bamboo_url")) && (@APP_CONFIG.nil? || @APP_CONFIG["bamboo_url"].nil?)
-        return false
-      else
-        return true
+      if !app.chronos_url.nil?
+        return app.chronos_url
       end
-    end
 
-    def chronos_url
-      if @options.has_key?("chronos_url")
-        # If passed in on command line override what is in config file
-        url = @options["chronos_url"]
-        return url
+      if !spec.config.nil?
+        if !spec.config.chronos_url.nil?
+          return spec.config.chronos_url
+        end
       end
 
-      if @APP_CONFIG.nil? || @APP_CONFIG["chronos_url"].nil?
-        puts "chronos_url not specified, use --chronos_url or set in ~/.orch/config.yml"
-        exit 1
+      if !@APP_CONFIG.nil?
+        if !@APP_CONFIG["chronos_url"].nil?
+          return @APP_CONFIG["chronos_url"]
+        end
       end
 
-      return @APP_CONFIG["chronos_url"]
+      return nil
     end
 
-    def marathon_url
+    def marathon_url(spec, app)
       if @options.has_key?("marathon_url")
-        # If passed in on command line override what is in config file
         url = @options["marathon_url"]
         return url
       end
 
-      if @APP_CONFIG.nil? || @APP_CONFIG["marathon_url"].nil?
-        puts "marathon_url not specified, use --marathon_url or set in ~/.orch/config.yml"
-        exit 1
+      if !app.marathon_url.nil?
+        return app.marathon_url
+      end
+
+      if !spec.config.nil?
+        if !spec.config.marathon_url.nil?
+          return spec.config.marathon_url
+        end
+      end
+
+      if !@APP_CONFIG.nil?
+        if !@APP_CONFIG["marathon_url"].nil?
+          return @APP_CONFIG["marathon_url"]
+        end
       end
 
-      return @APP_CONFIG["marathon_url"]
+      return nil
     end
 
-    def bamboo_url
+    def bamboo_url(spec, app)
       if @options.has_key?("bamboo_url")
-        # If passed in on command line override what is in config file
         url = @options["bamboo_url"]
         return url
       end
 
-      if @APP_CONFIG.nil? || @APP_CONFIG["bamboo_url"].nil?
-        puts "bamboo_url not specified, use --bamboo_url or set in ~/.orch/config.yml"
-        exit 1
+      if !app.bamboo_url.nil?
+        return app.bamboo_url
+      end
+
+      if !spec.config.nil?
+        if !spec.config.bamboo_url.nil?
+          return spec.config.bamboo_url
+        end
+      end
+
+      if !@APP_CONFIG.nil?
+        if !@APP_CONFIG["bamboo_url"].nil?
+          return @APP_CONFIG["bamboo_url"]
+        end
       end
 
-      return @APP_CONFIG["bamboo_url"]
+      return nil
     end
 
     def setup_config(settings)

data/lib/marathon.rb

@@ -14,17 +14,23 @@ end
 module Orch
   class Marathon
     def initialize(options)
-      # TODO: get chronos and marathon urls from diffferent ways: param, env, .config
-      @config = Orch::Config.new(options)
     end
 
-    def deploy(app_id, json_payload)
-      uri = URI(@config.marathon_url)
+    def deploy(url, app_id, json_payload)
+      if url.nil?
+        exit_with_msg "marathon_url not defined"
+      end
+
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.put("/v2/apps/#{app_id}", json_payload, json_headers)
+      begin
+        response = http.put("/v2/apps/#{app_id}", json_payload, json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       # TODO: should we do anyting with version or deploymentId that gets returned?
       if response.code == 201.to_s
@@ -38,13 +44,21 @@ module Orch
       return response
     end
 
-    def delete(id)
-      uri = URI(@config.marathon_url)
+    def delete(url, id)
+      if url.nil?
+        exit_with_msg "marathon_url not defined"
+      end
+
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.delete("/v2/apps/#{id}", json_headers)
+      begin
+        response = http.delete("/v2/apps/#{id}", json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code == 200.to_s
         puts "successfully deleted #{id}"
@@ -57,20 +71,24 @@ module Orch
       return response
     end
 
-    def verify(json_payload)
-      if @config.check_for_marathon_url == false
+    def verify(url, json_payload)
+      if url.nil?
         puts "no marathon_url - can not verify with server"
         return
       end
 
       spec = Hashie::Mash.new(JSON.parse(json_payload))
 
-      uri = URI(@config.marathon_url)
+      uri = URI(url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.get("/v2/apps/#{spec.id}", json_headers)
+      begin
+        response = http.get("/v2/apps/#{spec.id}", json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code == 200.to_s
         job = Hashie::Mash.new(JSON.parse(response.body))
@@ -86,14 +104,23 @@ module Orch
       return foundDiffs
     end
 
-    def restart(app_id)
+    def restart(url, app_id)
+      if url.nil?
+        exit_with_msg "marathon_url not defined"
+      end
+
+      uri = URI(url)
+
       # POST /v2/apps/{appId}/restart: Rolling restart of all tasks of the given app
-      uri = URI(@config.marathon_url)
       json_headers = {"Content-Type" => "application/json",
                 "Accept" => "application/json"}
 
       http = Net::HTTP.new(uri.host, uri.port)
-      response = http.post("/v2/apps/#{app_id}/restart", {}.to_json, json_headers)
+      begin
+        response = http.post("/v2/apps/#{app_id}/restart", {}.to_json, json_headers)
+      rescue *HTTP_ERRORS => error
+        http_fault(error)
+      end
 
       if response.code == 200.to_s
         puts "success"

data/lib/orch/version.rb

@@ -1,3 +1,3 @@
 module Orch
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/orch.rb

@@ -1,4 +1,5 @@
 require "orch/version"
+require 'util'
 require 'hashie'
 require 'json'
 require 'thor'
@@ -13,7 +14,7 @@ module Orch
 
     desc 'config', 'Interactive way to build ~/.orch/config.yml file'
     def config
-      config = Orch::Config.new(options)
+      $ORCH_CONFIG = Orch::Config.new(options)
 
       if File.file?("#{Dir.home}/.orch/config.yml")
         say "This will over-write your existing ~/.orch/config.yaml file", :yellow
@@ -28,7 +29,7 @@ module Orch
       settings["chronos_url"] = ask("Chronos URL: ")
       settings["bamboo_url"] = ask("Bamboo URL: ")
 
-      config.setup_config(settings)
+      $ORCH_CONFIG.setup_config(settings)
     end
 
     option :deploy_kind, :default => 'all',
@@ -41,17 +42,30 @@ module Orch
            :desc => 'show the json result that would be sent to Chronos or Marathon'
     option :server_verify, :default => true,
            :desc => 'verify the configuration against the server'
-    desc 'verify PATH', 'Checks basic syntax and does not deploy'
+    option :chronos_url,
+           :desc => 'url to chronos master'
+    option :marathon_url,
+           :desc => 'url to marathon master'
+    option :bamboo_url,
+           :desc => 'url to bamboo server'
+    desc 'verify PATH', 'Checks basic syntax, server configuration and does not deploy'
     def verify(file_name)
+      $ORCH_CONFIG = Orch::Config.new(options)
       parser = Orch::Parse.new(file_name, options)
       result = parser.parse(true)
-      puts "Number of configs found: #{result.length}"
+
+      numToDeploy = 0
+      result.each do |app|
+        numToDeploy += 1 if app[:deploy] == true
+      end
+      puts "Number of configs found: #{result.length} - #{numToDeploy} would deploy"
 
       marathon = Orch::Marathon.new(options)
       chronos = Orch::Chronos.new(options)
       bamboo = Orch::Bamboo.new(options)
       result.each do |app|
-        printf "Name: %s, Type: %s, Deploy?: %s", app[:name], app[:type], app[:deploy]
+        next if app[:deploy] == false
+        printf "Name: %s, Type: %s", app[:name], app[:type]
         app[:env_vars].each do |key, value|
           printf ", %s: %s", key, value
         end
@@ -62,12 +76,12 @@ module Orch
         end
         foundDiffs = false
         if (app[:type] == "Chronos") && (options[:server_verify] == true)
-          foundDiffs = chronos.verify(app[:json].to_json)
+          foundDiffs = chronos.verify(app[:url], app[:json].to_json)
         end
         if (app[:type] == "Marathon") && (options[:server_verify] == true)
-          foundDiffs = marathon.verify(app[:json].to_json)
+          foundDiffs = marathon.verify(app[:url], app[:json].to_json)
           if app[:bamboo_spec]
-            bambooDiffs = bamboo.verify(app[:name], app[:bamboo_spec])
+            bambooDiffs = bamboo.verify(app[:bamboo_url], app[:name], app[:bamboo_spec])
             foundDiffs = foundDiffs || bambooDiffs
           end
         end
@@ -81,16 +95,17 @@ module Orch
            :desc => 'deploys only the given application kind: chronos, marathon, all'
     option :deploy_var, :default => 'all',
            :desc => 'DEPLOY_VAR=VALUE deploys only if a deploy_var matches the given value'
+    option :subst,
+           :desc => 'KEY=VALUE substitute KEY with VALUE globaly in your config'
     option :chronos_url,
            :desc => 'url to chronos master'
     option :marathon_url,
            :desc => 'url to marathon master'
     option :bamboo_url,
            :desc => 'url to bamboo server'
-    option :subst,
-           :desc => 'KEY=VALUE substitute KEY with VALUE globaly in your config'
-    desc 'deploy PATH', 'Deploys config to mesos frameworks.'
+    desc 'deploy PATH', 'Deploys application(s) to mesos frameworks.'
     def deploy(file_name)
+      $ORCH_CONFIG = Orch::Config.new(options)
       parser = Orch::Parse.new(file_name, options)
       result = parser.parse(false)
 
@@ -109,12 +124,12 @@ module Orch
         puts "deploying #{app[:name]} to #{app[:type]}"
         #puts "#{app[:json]}"  - should I support show_json here as well?
         if app[:type] == "Chronos"
-          chronos.deploy(app[:json].to_json)
+          chronos.deploy(app[:url], app[:json].to_json)
         end
         if app[:type] == "Marathon"
-          marathon.deploy(app[:name], app[:json].to_json)
+          marathon.deploy(app[:url], app[:name], app[:json].to_json)
           if app[:bamboo_spec]
-            bamboo.deploy(app[:name], app[:bamboo_spec])
+            bamboo.deploy(app[:bamboo_url], app[:name], app[:bamboo_spec])
           end
         end
       end
@@ -124,16 +139,17 @@ module Orch
            :desc => 'deletes only the given application kind: chronos, marathon, all'
     option :deploy_var, :default => 'all',
            :desc => 'DEPLOY_VAR=VALUE deletes only if a deploy_var matches the given value'
+    option :subst,
+           :desc => 'KEY=VALUE substitute KEY with VALUE globaly in your config'
     option :chronos_url,
            :desc => 'url to chronos master'
     option :marathon_url,
            :desc => 'url to marathon master'
     option :bamboo_url,
            :desc => 'url to bamboo server'
-    option :subst,
-           :desc => 'KEY=VALUE substitute KEY with VALUE globaly in your config'
-    desc 'delete PATH', 'Deletes config from mesos frameworks.'
+    desc 'delete PATH', 'Deletes application(s) from mesos frameworks.'
     def delete(file_name)
+      $ORCH_CONFIG = Orch::Config.new(options)
       parser = Orch::Parse.new(file_name, options)
       result = parser.parse(false)
 
@@ -152,12 +168,12 @@ module Orch
         end
         puts "deleting #{app[:name]} from #{app[:type]}"
         if app[:type] == "Chronos"
-          chronos.delete(app[:name])
+          chronos.delete(app[:url], app[:name])
         end
         if app[:type] == "Marathon"
-          marathon.delete(app[:name])
+          marathon.delete(app[:url], app[:name])
           if app[:bamboo_spec]
-            bamboo.delete(app[:name])
+            bamboo.delete(app[:url], app[:name])
           end
         end
       end
@@ -173,6 +189,7 @@ module Orch
            :desc => 'KEY=VALUE substitute KEY with VALUE globaly in your config'
     desc 'restart PATH', 'Restarts specified application(s) on server'
     def restart(file_name)
+      $ORCH_CONFIG = Orch::Config.new(options)
       parser = Orch::Parse.new(file_name, options)
       result = parser.parse(false)
 
@@ -188,7 +205,7 @@ module Orch
         end
         puts "restarting #{app[:name]} on #{app[:type]}"
         if app[:type] == "Marathon"
-          marathon.restart(app[:name])
+          marathon.restart(app[:url], app[:name])
         end
       end
     end

data/lib/parse.rb

@@ -1,20 +1,20 @@
 require 'yaml'
 require 'json'
 
+CURRENT_SPEC_VERSION=1.0
+
 module Orch
   class Parse
 
     def initialize(path, options)
       if ! File.file?(path)
-        puts "file does not exist: #{path}"
-        exit 1
+        exit_with_msg "file does not exist: #{path}"
       end
 
       begin
         yaml = ::YAML.load_file(path)
       rescue Psych::SyntaxError => e
-        puts "error parsing yaml file #{e}"
-        exit 1
+        exit_with_msg "error parsing yaml file #{e}"
       end
 
       @options = options
@@ -25,19 +25,9 @@ module Orch
     def parse(dry_run)
       @dry_run = dry_run
       check_option_syntax
+      check_version
       spec = @spec
 
-      # Check for valid version paramter
-      if spec.version.nil?
-        puts "required field version was not found"
-        exit 1
-      end
-      if spec.version != "alpha1"
-        puts "unsupported orch version specified: #{spec.version}"
-        puts "application only understands version alpha1"
-        exit 1
-      end
-
       # Check for vault vars
       env_var_values = parse_vault_vars(@spec)
 
@@ -47,21 +37,18 @@ module Orch
       end
 
       if spec.applications.nil?
-        puts "required section applications: must have at least one application defined"
-        exit 1
+        exit_with_msg "required section applications: must have at least one application defined"
       end
 
       results = []
       spec.applications.each do |app|
         # Check for valid kind paramter
         if app.kind.nil?
-          puts "required field 'kind:' was not found"
-          exit 1
+          exit_with_msg "required field 'kind:' was not found"
         end
 
         if !(app.kind == "Chronos" || app.kind == "Marathon")
-          puts "unsupported kind specified: #{app.kind} - must be: Chronos | Marathon"
-          exit 1
+          exit_with_msg "unsupported kind specified: #{app.kind} - must be: Chronos | Marathon"
         end
 
         # Generate any deploy variables that need to be merged in
@@ -76,18 +63,34 @@ module Orch
         if (app.kind == "Chronos")
           chronos_spec = parse_chronos(app, app_var_values)
 
-          result = {:name => chronos_spec["name"], :type => app.kind, :deploy => should_deploy?(app), :env_vars => deploy_vars, :json => chronos_spec}
+          result = {
+            :name => chronos_spec["name"], 
+            :type => app.kind, 
+            :deploy => should_deploy?(app), 
+            :env_vars => deploy_vars, 
+            :json => chronos_spec,
+            :url => $ORCH_CONFIG.chronos_url(spec, app)
+          }
+
           results << result
         end
 
         if (app.kind == "Marathon")
           marathon_spec = parse_marathon(app, app_var_values)
 
-          result = {:name => marathon_spec["id"], :type => app.kind, :deploy => should_deploy?(app), :env_vars => deploy_vars, :json => marathon_spec}
+          result = {
+            :name => marathon_spec["id"], 
+            :type => app.kind, 
+            :deploy => should_deploy?(app), 
+            :env_vars => deploy_vars, 
+            :json => marathon_spec,
+            :url => $ORCH_CONFIG.marathon_url(spec, app)
+          }
 
           if app.bamboo_spec
             bamboo_spec = parse_bamboo(app, app_var_values)
             result[:bamboo_spec] = bamboo_spec
+            result[:bamboo_url] = $ORCH_CONFIG.bamboo_url(spec, app)
           end
 
           results << result
@@ -103,13 +106,11 @@ module Orch
       if (! @spec.deploy_vars.nil?)
         @spec.deploy_vars.each do |key, value|
           if app[key].nil?
-            puts "environments_var #{key} specified - but not included in app"
+            exit_with_msg "deploy_var #{key} specified - but not included in app"
             # TODO: would be nice to put the app name...
-            exit 1
           end
           if ! @spec.deploy_vars[key].include? app[key]
-            puts "#{key} value \"#{app[key]}\" not in #{@spec.deploy_vars[key].to_s}"
-            exit 1
+            exit_with_msg "#{key} value \"#{app[key]}\" not in #{@spec.deploy_vars[key].to_s}"
           end
           result[key] = app[key]
         end
@@ -132,8 +133,7 @@ module Orch
 
     def parse_chronos(app, env_var_values)
       if app.chronos_spec.nil?
-        puts "App of kind: Chronos requires a 'chronos_spec:' field"
-        exit 1
+        exit_with_msg "App of kind: Chronos requires a 'chronos_spec:' field"
       end
       chronos_spec = app.chronos_spec
 
@@ -159,8 +159,7 @@ module Orch
 
     def parse_marathon(app, env_var_values)
       if app.marathon_spec.nil?
-        puts "App of kind: Marathon requires a 'marathon_spec:' field"
-        exit 1
+        exit_with_msg "App of kind: Marathon requires a 'marathon_spec:' field"
       end
       marathon_spec = app.marathon_spec
 
@@ -173,8 +172,7 @@ module Orch
       if marathon_spec.id
         marathon_spec.id = (marathon_spec.id[0] == '/') ? marathon_spec.id : ("/" + marathon_spec.id)
       else
-        puts "id: is a required field for a marathon spec"
-        exit 1
+        exit_with_msg "id: is a required field for a marathon spec"
       end
 
       spec_str = do_subst(marathon_spec, app)
@@ -207,8 +205,7 @@ module Orch
           deployVar = pair[0]
           deployVal = pair[1]
           if app[deployVar].nil?
-            puts "environment var of '#{deployVar}' not found in app"
-            exit 1
+            exit_with_msg "environment var of '#{deployVar}' not found in app"
           end
           if app[deployVar] != deployVal
             result = false
@@ -237,17 +234,48 @@ module Orch
         end
       end
 
+      # Check if any substitution variables still exist
+      tag_match = /{{\w+}}/.match(spec_str)
+      if !tag_match.nil?
+        exit_with_msg "unsubstituted varaibles still remain in spec: #{tag_match.to_s}"
+      end
+
       return spec_str
     end
 
+    def check_version
+
+      # Check for valid version paramter
+      if @spec.version.nil?
+        exit_with_msg "required field version was not found"
+      end
+
+      if @spec.version == "alpha1"
+        # Getting rid of alpha1 syntax and just going to number syntax.  Will support this for a little bit...
+        version = 1.0
+      else
+
+        number = Float( @spec.version ) rescue nil
+        if number.nil? 
+          exit_with_msg "invalid value \"#{@spec.version}\" for version field of spec"
+        end
+        version = number
+      end
+
+      if version > CURRENT_SPEC_VERSION
+        STDERR.puts "warning: spec version greater than software supports - may get failure or unexpected behavior"
+      end
+
+      # If we get to point where we need to support older formats - determine that here.
+    end
+
     def check_option_syntax
       if @dry_run
         return
       end
 
       if ! ['chronos', 'marathon', 'all'].include?(@options[:deploy_kind])
-        puts "value of --deploy-type was #{@options[:deploy_kind]}, must be chronos, marathon or all"
-        exit 1
+        exit_with_msg "value of --deploy-type was #{@options[:deploy_kind]}, must be chronos, marathon or all"
       end
     end
   end

data/lib/util.rb

@@ -0,0 +1,22 @@
+require 'net/http'
+
+HTTP_ERRORS = [
+  EOFError,
+  Errno::ECONNRESET,
+  Errno::EINVAL,
+  Net::HTTPBadResponse,
+  Net::HTTPHeaderSyntaxError,
+  Net::ProtocolError,
+  Timeout::Error,
+  Errno::ECONNREFUSED
+]
+
+def http_fault(error)
+  puts "Networking error talking to framework: #{error.to_s}"
+  exit 1
+end
+
+def exit_with_msg(err_msg)
+  puts err_msg
+  exit 1
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ray Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,7 @@ files:
 - lib/orch.rb
 - lib/orch/version.rb
 - lib/parse.rb
+- lib/util.rb
 - orch.gemspec
 homepage: https://github.com/rayjohnson/orch
 licenses:
@@ -114,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: orch uses yaml to deploy to Mesos' Marathon and Chronos frameworks