marathon_deploy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bcaf91224aa85fcdf139558d0a9b46e77ebe2d6
-  data.tar.gz: b49329c3062882104d991d1e2daa37f3fb8b19ee
+  metadata.gz: 66057ff70c6413bf464ae07fd56a42607e5db141
+  data.tar.gz: b9f77c6bae0ca2517d6696142625376257745481
 SHA512:
-  metadata.gz: 0c37bd73039acd741397ad43832058cd7ab2414992d75acf910e18c8bf25e46bef87d3c85e44547f3b732f7a0f0debe7eafdce1b9e5894881555048bd5f00515
-  data.tar.gz: 8514f8c1b68168551fbb7f2dd493c759fad92c1908c4755c7095afc2cf3287a272bc1cf71a471a4da084339bd536d5b74bb76bdcefe3b2af25e2263952f51318
+  metadata.gz: 5801d37f9352ac4bbf96dd123f04d6d6ce06a34b89c50764c77eca9b34fee570ec8842c584c0f952270e60adacc05f88e118b18e18ce592c5544054a28ea1a9d
+  data.tar.gz: f3273ef63fa0c04e0f3ffe98bbeb8b6e05e2ed2f411f2038e516414cd557b065f3e8b37a8aeebee9012e435f560613bc51e49370dd0606a7ab06bad067456aad

data/Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = "test/*_test.rb"
+end
 

data/lib/marathon_deploy/application.rb

@@ -13,13 +13,13 @@ module MarathonDeploy
   def initialize(options={})
     default_options = {
       :force => false,
-      :deployfile => 'deploy.yaml'
-      }
+      :deployfile => 'deploy.yml'
+      }      
     options = default_options.merge!(options)
     deployfile = options[:deployfile]
     
-    if (!File.exist?(File.join(Dir.pwd,deployfile)))
-      message = "\'#{deployfile}\' not found in current directory #{File.join(Dir.pwd)}"
+    if (!File.exist?(deployfile))
+      message = "\'#{File.expand_path(deployfile)}\' not found."
       raise Error::IOError, message, caller
     end
 
@@ -66,7 +66,11 @@ module MarathonDeploy
   end
   
   def to_s
-    return id
+    return JSON.pretty_generate(@json)
+  end
+  
+  def env
+    @json[:env]
   end
   
   def id

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/marathon_deploy.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.7"
+
 end

data/test/application_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class ApplicationTest < Minitest::Test
+  def setup
+    $LOG = Logger.new(STDOUT)
+    $LOG.level = Logger::INFO
+    @release_version = "TEST_VERSION_#{Time.now.utc.iso8601}"
+    ENV['RELEASE_VERSION'] = @release_version
+    @json = File.expand_path('../fixtures/deploy.json',__FILE__)
+    @yml = File.expand_path('../fixtures/deploy.yml',__FILE__)
+  end
+  
+  def test_new_application_with_json
+    application = MarathonDeploy::Application.new(:deployfile => @json)
+    assert_instance_of(MarathonDeploy::Application,application)
+    refute_empty(application.id)
+    application.add_envs({ :MINITEST => "MINITEST_ENV_TEST" })
+    assert_equal("MINITEST_ENV_TEST",application.env[:MINITEST])
+  end
+  
+  def test_new_application_with_yaml
+    application = MarathonDeploy::Application.new(:deployfile => @yml)
+    assert_instance_of(MarathonDeploy::Application,application)
+    refute_empty(application.id)
+    assert_equal(@release_version,application.env[:RELEASE_VERSION])
+  end
+  
+end

data/test/environment_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class EnvironmentTest < Minitest::Test
+  def setup
+    puts "YOYO"
+  end
+  
+  def test_env
+    puts "THIS IS ENV"
+  end
+end

data/test/fixtures/deploy.json

@@ -0,0 +1,66 @@
+{
+    "args": [
+        "properties.py && FOO=\"`cat /opt/etc/public-search-germany-webapp.properties | grep -v '^\\s*#' | grep -E '.+=.+'`\"; echo $FOO; echo; env $FOO; echo; env $FOO hostName=$HOSTNAME backend.instance.name=$HOSTNAME java -Dhttp.port=8080 -Dajp.port=8009 -Dinstance.confdir=file:///opt/etc -Dbackend.logdir=$MESOS_SANDBOX -Dlog.rootDir=$MESOS_SANDBOX -DlogDir=$MESOS_SANDBOX $CMD_OPTS -Xmx$JAVA_XMX -Xms$JAVA_XMS -jar $MESOS_SANDBOX/public-search-germany-webapp*.jar"
+    ],
+    "cmd": null,
+    "container": {
+        "docker": {
+            "image": "dockerregistry.mobile.rz/mobile-java8:latest",
+            "network": "BRIDGE",
+            "portMappings": [
+                {
+                    "containerPort": 8080,
+                    "hostPort": 0,
+                    "protocol": "tcp"
+                },
+                {
+                    "containerPort": 8009,
+                    "hostPort": 0,
+                    "protocol": "tcp"
+                }
+            ]
+        },
+        "type": "DOCKER"
+    },
+    "cpus": 0.1,
+    "env": {
+        "APPLICATION_NAME": "public-search-germany-webapp",
+        "CMD_OPTS": "",
+        "CONFIG_ASSEMBLER_BASE_URL": "http://mobile-config-assembler.service.consul/config-assembler",
+        "DATACENTER_NUMBER": "44",
+        "JAVA_XMS": "252m",
+        "JAVA_XMX": "504m",
+        "SERVERCLASS_NAME": "pubse",
+        "SERVICE_8009_NAME": "public-search-germany-webapp",
+        "SERVICE_8009_TAGS": "ajp",
+        "SERVICE_8080_CHECK_SCRIPT": "curl --fail --silent $HOST_IP:$SERVICE_PORT/fz/release-info",
+        "SERVICE_8080_NAME": "public-search-germany-webapp",
+        "SERVICE_8080_TAGS": "http,haproxy"
+    },
+    "healthChecks": [
+        {
+            "gracePeriodSeconds": 30,
+            "intervalSeconds": 10,
+            "maxConsecutiveFailures": 3,
+            "portIndex": 0,
+            "protocol": "TCP",
+            "timeoutSeconds": 30
+        },
+        {
+            "gracePeriodSeconds": 30,
+            "intervalSeconds": 10,
+            "maxConsecutiveFailures": 3,
+            "path": "/fz/release-info",
+            "portIndex": 0,
+            "protocol": "HTTP",
+            "timeoutSeconds": 30
+        }
+    ],
+    "id": "public-search-germany-webapp",
+    "instances": 4,
+    "mem": 512,
+    "storeUrls": [
+        "http://maven-download.mobile.rz/maven/hosted-mobile-deployment-productive-releases/de/mobile/public-search-germany-webapp/ecs-1558-gb70c745/public-search-germany-webapp-ecs-1558-gb70c745.jar"
+    ],
+    "uris": []
+}

data/test/fixtures/deploy.yml

@@ -0,0 +1,33 @@
+---
+id: python-example-stable
+cmd: echo python stable `hostname` > index.html; python3 -m http.server 8080
+mem: 16
+cpus: 0.1
+instances: 5
+container:
+  type: DOCKER
+  docker:
+    image: ubuntu:14.04
+    network: BRIDGE
+    portMappings:
+    - containerPort: 8080
+      hostPort: 0
+      protocol: tcp
+env:
+  SERVICE_TAGS: python,webapp,http,weight=100
+  SERVICE_NAME: python
+  RELEASE_VERSION: %%RELEASE_VERSION%%
+healthChecks:
+- portIndex: 0
+  protocol: TCP
+  gracePeriodSeconds: 30
+  intervalSeconds: 10
+  timeoutSeconds: 30
+  maxConsecutiveFailures: 3
+- path: "/"
+  portIndex: 0
+  protocol: HTTP
+  gracePeriodSeconds: 30
+  intervalSeconds: 10
+  timeoutSeconds: 30
+  maxConsecutiveFailures: 3

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+require 'marathon_deploy'
+require 'logger'
+require 'time'
+require 'marathon_deploy/application'
+require 'minitest/autorun'
+require 'minitest/unit'
+require 'minitest/pride'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
 description: Pushes a yaml or json file to the Marathon API.
 email:
 - jcolby@team.mobile.de
@@ -109,6 +123,11 @@ files:
 - lib/marathon_deploy/version.rb
 - lib/marathon_deploy/yaml_json.rb
 - marathon_deploy.gemspec
+- test/application_test.rb
+- test/environment_test.rb
+- test/fixtures/deploy.json
+- test/fixtures/deploy.yml
+- test/test_helper.rb
 homepage: https://github.com/joncolby/marathon_deploy
 licenses:
 - MIT
@@ -133,4 +152,9 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mesos/Marathon deployment tool.
-test_files: []
+test_files:
+- test/application_test.rb
+- test/environment_test.rb
+- test/fixtures/deploy.json
+- test/fixtures/deploy.yml
+- test/test_helper.rb