orchparty 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ccdea8159a378436eaf3a11787bacf9535f8ad
-  data.tar.gz: 3dba4a2eefd4c7939dff7a96a27b4fb3b04d19d1
+  metadata.gz: 36cea1b0eaf3894a0bc33bba74ac62d5280bfbb0
+  data.tar.gz: edb5d5f36cb497497aab8a3fbf82e53baa127ba0
 SHA512:
-  metadata.gz: 7754f19348534203cf89552abbd3dd8288380770e1e5045e1735ec1196b4ab49caadc4c96cd7c9f93d3da302b240bd60e15e00ff19015224f9e4c2eb4a3e78bc
-  data.tar.gz: f770f266217b8131e7cfff17952ab49f3a1d54cf19af52465d57dd8942fbcd6710a4798cfad6222683f28d295ea407b596ce580d9916bdc0474f6af012162df0
+  metadata.gz: ccd0aca2b0d5e7f5b43121abff1a099fa790bfb229abf278bd171312d95fc1f413fd1b80fec560172f686e8900742b800f57b4ebf932341f000c9394222cf6e2
+  data.tar.gz: 8507ef27dbe893728d94b5f50bc9678185332742c89337b90ad241e5b9844c34f933e317e8f538bf69720a83c088ae4ccaefac225c25eadce41697bcbc3c41be

data/.travis.yml

@@ -1,9 +1,15 @@
-sudo: false
+sudo: required
+services:
+- docker
 language: ruby
+env:
+  global:
+  - secure: gQZ3h3P2ZWPZHsgEPA1C0vdRcegPGO72E/rv3VeWybkVUbQbjbem6SSd0RIQN7G/BWcUx7NfvFkjErMpnNqpFAiM5dqRJzfvLiNox9mAJLsvke4/aJSokfT8348tpwZ9adfSK1HmAtIurb20vE7HTWUO4Sjf18Min3Kh9brz0+dtMhheAwx0NxtwRdpQ2WCmr8gB6OSC3X+AHjg0Vokb8I/o4TC53akJ1D84aowk6zqij+lPZzEtnRcaRe8UU7CS+91k16wnPg2+gy/4IpaHRq9bOSOrspBGI7SbMfDGpTWV3ytUvXfvGYYD2hJ4RbX5KiqF3Lma21WuxrQl8e9AzSfSuW2EFGbvRxF5J5XlE4z4AW9ooaJ3iFkP53m4DEdxL+9SaN2M3RuGM07ojXDJNsl7gTPciz61V4kDiyMB2Fg4+PPJM/ug2Jr8Sm4ONjO28cWN4AZYu1tj4YVXOaw2ftk8dzEOqu3gqafamENLrF2IiupGkTltdQMqIr3iDmkhN0cDigO2geqz8bCWViZ17A1Q+k4J8U4vfI1gnfv2DQza3AYj5Jd4qy5f1C8Zgw1z/hKwX6snN1CtRU7wYw4IEUPHxs4sJf+kg+64aUy4PnvO1+mKroUjFoggPBZnVYKNHLl8w5falmSPH9PratGf3nH0xJPcsUGKfrago7irU1Y=
+  - secure: FRzU0dSarYMvl3AMNNymJJ6FtmS9erZdhqiD3GNoChrZkdN2dBUdmXKVvUH/EPqSCIEJlN1ZTyvp4SWRutHVJ1h5xqOe50gIX1tYPoSdSWk83ZPW5JuPbQVqBZfVUILsI8MY832j4MP+NgjudsYtGqrWLlj8AikojiQuQOGRPyJ54msxe4WxsHwLM+QC+uVL+qIBRxIQa1EHznCaOy4cnKuIikYqwE57+aDAOfhSHDAB2FFUYtE1R2gTmTfe708UE3o47ksdUNZRwv4+BUwltg21YGgNqPq+qtHdiSwp4FD5WSEfjGaTJ8U6bMZksUMQu7LarJnQSiCuaY/jXfsSJ0/p5IkWenHsVX3aZ2sS6sMw1e/0stWcpbxYwYJaGJ8W9vPuBpivFl05n0goP7EeC3llKtIDQm3STU3UpKrPszyv0WgGB7tNjRZdWDMaX7R9rzISkzEORFPY7A4HLpbKt14LEGNFDf7ZSUIVFntIKK5ZPe+PaUtZPQFaVqPOht3UiY0EvYkNKmcsM6FdkI6uJxm0IhXTJ0wUMgQyzzCpZkBWhqrHkxJkTi2ByBj9OzvrPYzYe0xuPmqDOIpFnZL2Gp8lXWKe0DJ27zD+dHprflPjtA7DJt95THZnH4Nv1VVoI1oRk2IU4ZA94c7hc+gA9JU5jAGd0r9yTYp3/rMLHCw=
 addons:
   code_climate:
     repo_token:
-      secure: "HTTk2xYKjsWmnOkQd0CX/ltH5E87vRmqm5z+010D4wc4P8gxrbdwgZB9J/KgKp0u55WP1Ox64VQiMqBQxAOAlMyWd+Wnys6u/ooZx8Wk8msEBio7Pf75VYTLrAfOiRNcE7iYqcv/SBrdj6jkA0+defKtZT65RavVef6B9dyPxXW8lTijW6BAM15Qe+Gh/o+hfLGAeNPMCvNmkXQL/aucGaihqJHU7AJ+udtiCBRJPuXKRSKp92rpj6ar9QyrRNH71V0sJLzpG4CS7xvSwMsKcN1VSzI8TtIYaw602EDesM/82igqgajYCJLYuvUefwexdL+eA8S+P4YHi+QkD4bCFxU1YzWQbFty2B5HBF5RJl3TVeGKu3v3NLQE7MzMfr2g6Cxq4BAY4DdRygVkeviJZJnO8D4iLfZTsawqoga6z+loj89bDxBmHHJxWPYWefOeUJDu2oC9OsxVqAIw/fZ2aorjslRMYieej8GqmZw8USbyGl+t5I4AyaUu8bAcR2pnUaZr+d9/4mA+qFow8XJNuMN2ldfKbGPYXsEiJm57aBNLaOtT5WYQ1m8TRJnaBI+26G2vNXol/OBB5Lh2ThhHDmCyGIEK91uBGGuqw1sDyIriY2DbbuHQFkprEUDLcSnDr7OxvmIaJivdcayYUaM0/znO35owdxH1Y2RCiL50WQc="
+      secure: HTTk2xYKjsWmnOkQd0CX/ltH5E87vRmqm5z+010D4wc4P8gxrbdwgZB9J/KgKp0u55WP1Ox64VQiMqBQxAOAlMyWd+Wnys6u/ooZx8Wk8msEBio7Pf75VYTLrAfOiRNcE7iYqcv/SBrdj6jkA0+defKtZT65RavVef6B9dyPxXW8lTijW6BAM15Qe+Gh/o+hfLGAeNPMCvNmkXQL/aucGaihqJHU7AJ+udtiCBRJPuXKRSKp92rpj6ar9QyrRNH71V0sJLzpG4CS7xvSwMsKcN1VSzI8TtIYaw602EDesM/82igqgajYCJLYuvUefwexdL+eA8S+P4YHi+QkD4bCFxU1YzWQbFty2B5HBF5RJl3TVeGKu3v3NLQE7MzMfr2g6Cxq4BAY4DdRygVkeviJZJnO8D4iLfZTsawqoga6z+loj89bDxBmHHJxWPYWefOeUJDu2oC9OsxVqAIw/fZ2aorjslRMYieej8GqmZw8USbyGl+t5I4AyaUu8bAcR2pnUaZr+d9/4mA+qFow8XJNuMN2ldfKbGPYXsEiJm57aBNLaOtT5WYQ1m8TRJnaBI+26G2vNXol/OBB5Lh2ThhHDmCyGIEK91uBGGuqw1sDyIriY2DbbuHQFkprEUDLcSnDr7OxvmIaJivdcayYUaM0/znO35owdxH1Y2RCiL50WQc=
 rvm:
 - 2.2
 - 2.3
@@ -12,13 +18,19 @@ before_install: gem install bundler -v 1.13.6
 install: bundle install
 script: bundle exec rspec
 after_success:
-      - bundle exec codeclimate-test-reporter
+- bundle exec codeclimate-test-reporter
 deploy:
-  provider: rubygems
-  api_key:
-    secure: XnUBF2iCbMQXD/hUDcbOF2Y66x2A+Fjg0qx5ceJB7ctOnh2Q6NWMjcxF0oINteryzY78gbI3BB0GnemX8nrvJ/kLxgVWSOPBPlR1ufREekSkElPnccGi6oH8D6goI0d3rtB81cwOzJl+BhXCLFiJRvySOmDBw87ENhianMwhNf+6oW/QgAHKHKuu9hJM91u5Z+8dw8x5iqMtxxiiCPSmd9T6PDknJDD3sz2XdSOMGRQO9EqFQSdngX6AbRRgOewY+klXCut44Vc8SefIqtmRQ6/VF5onTNeLL4ZJkiazS2r4Xi93jl0/lzIamqDIinbVFx5xVH1Kb3JyjkRnW/Ah6tHtwQZlJUuJLQbRFKDY+w3dXKKn7rLaV3neQ9q/0TxlHuUQqQsLV6cY38Xb0y/x+xYvNaWy7oDLe836dHIvxec3Ea7t0wt2HMk5jVuFDNm3TnSvu7mYbF+ZoYyYLFLtX35KMu7WMDQnHU6zvJPdE6EFENoximY/MiX0vvco0Z4HiQmJFRrmvA/gGKgn7qpan+6oysrLg/oVWOgYbc5BQmLoX9jxnb//BSWlxxD85tBGlG/IO1pOU/FAFNlbheqxfoF/YUyWJQCIX0V1H13+10KuLBSSX+lg4BkxmluWC4VsqMeMwTHtEgKb7x7nIJsRxmcvyqIeD/noCoSooLgUH+A=
-  gem: orchparty
-  on:
-    tags: true
-    repo: jannishuebl/orchparty
-    rvm: 2.4
+  - provider: rubygems
+    api_key:
+      secure: XnUBF2iCbMQXD/hUDcbOF2Y66x2A+Fjg0qx5ceJB7ctOnh2Q6NWMjcxF0oINteryzY78gbI3BB0GnemX8nrvJ/kLxgVWSOPBPlR1ufREekSkElPnccGi6oH8D6goI0d3rtB81cwOzJl+BhXCLFiJRvySOmDBw87ENhianMwhNf+6oW/QgAHKHKuu9hJM91u5Z+8dw8x5iqMtxxiiCPSmd9T6PDknJDD3sz2XdSOMGRQO9EqFQSdngX6AbRRgOewY+klXCut44Vc8SefIqtmRQ6/VF5onTNeLL4ZJkiazS2r4Xi93jl0/lzIamqDIinbVFx5xVH1Kb3JyjkRnW/Ah6tHtwQZlJUuJLQbRFKDY+w3dXKKn7rLaV3neQ9q/0TxlHuUQqQsLV6cY38Xb0y/x+xYvNaWy7oDLe836dHIvxec3Ea7t0wt2HMk5jVuFDNm3TnSvu7mYbF+ZoYyYLFLtX35KMu7WMDQnHU6zvJPdE6EFENoximY/MiX0vvco0Z4HiQmJFRrmvA/gGKgn7qpan+6oysrLg/oVWOgYbc5BQmLoX9jxnb//BSWlxxD85tBGlG/IO1pOU/FAFNlbheqxfoF/YUyWJQCIX0V1H13+10KuLBSSX+lg4BkxmluWC4VsqMeMwTHtEgKb7x7nIJsRxmcvyqIeD/noCoSooLgUH+A=
+    gem: orchparty
+    on:
+      tags: true
+      repo: jannishuebl/orchparty
+      rvm: 2.4
+  - provider: script
+    script: rake upload_docker
+    on:
+      tags: true
+      repo: jannishuebl/orchparty
+      rvm: 2.4

data/Dockerfile

@@ -1,14 +1,6 @@
-FROM ruby:2.3.1-slim
-RUN apt-get update && apt-get install -y git
-RUN mkdir /orchparty
-WORKDIR /orchparty
-ADD Gemfile .
-ADD Gemfile.lock .
-ADD orchparty.gemspec .
-ADD lib lib
-ADD .git .git
-RUN bundle install --without development test
-ADD . .
-RUN rake install
-COPY docker-entrypoint /usr/local/bin/
-ENTRYPOINT ["/bin/sh", "docker-entrypoint"]
+FROM ruby:2.4.1-slim
+COPY docker-entrypoint .
+ENTRYPOINT ["/bin/sh", "docker-entrypoint"]
+ADD pkg/ pkg
+RUN gem install pkg/orchparty-*
+

data/README.md

@@ -73,13 +73,31 @@ orchparty and we just simply compile the config for all popular orchestration fr
 
 ## Installation
 
-Setup a Ruby Enviroment with Ruby 2.2 or higher is necessary for the intallation.
+### Run via docker
+
+**Currently only relativ path are supported when running via docker.**
+
+Add to bashrc:
+
+```bash
+  alias orchparty="docker run --rm -v /:/rootfs -e ROOT_PWD=$PWD jannishuebl/orchparty:latest"
+```
+
+As tag you can use semantic versioning eg X.X.X or X.X or X.
+
+If you use latest update by running:
 
-Install from rubygems.org
+    $ docker pull jannishuebl/orchparty:latest
+
+### Install from rubygems.org
+
+Setup a Ruby Enviroment with Ruby 2.2 or higher is necessary for the intallation.
 
     $ gem install orchparty
 
-Maybe for the future it is possible to run the gem in a docker container, so no local Ruby Environment is needed.
+Update:
+
+    $ gem update orchparty
 
 ## Usage
 
@@ -111,23 +129,6 @@ Orchparty.generate(:docker_compose_v1,
                     {output: "path/to/output_file.yml"})
 ```
 
-### In your own piece of code
-
-```ruby
-require 'orchparty'
-
-# load the generator plugin you want to use
-Orchparty.plugin :docker_compose_v1
-
-Orchparty.generate(:docker_compose_v1,
-                     # all options that are needed for orchparty to transform
-                     # your input to a plain hash for generating
-                    {filename: "path/to/input_file.rb",
-                     application: "application_name_to_generate" },
-                     # all options that are needed for the plugin
-                    {output: "path/to/output_file.yml"})
-```
-
 ## DSL spec
 
 So let us start an example! Let us implement a configuration for a beautiful app called [app_perf](https://github.com/randy-girard/app_perf) with orchparty. This App is an opensource replacement for [New Relic](https://newrelic.com/)!

data/Rakefile

@@ -1,7 +1,19 @@
 require "bundler/gem_tasks"
+require_relative 'lib/orchparty/version.rb'
 
 
-task :upload_docker do
-  `docker build . `
+task :upload_docker => [:build] do
+  version = Orchparty::VERSION.split(".")
+  tags = []
+  tags << "latest"
+  tags << version.join(".")
+  tags << version[0..1].join(".")
+  tags << version[0]
 
+  puts `docker login -u $DOCKER_USER -p $DOCKER_PASS`
+  puts `docker build . -t orchparty`
+  tags.each do |tag|
+    puts `docker tag orchparty jannishuebl/orchparty:#{tag}`
+    puts `docker push jannishuebl/orchparty:#{tag}`
+  end
 end

data/lib/orchparty/plugins/docker_compose_v2.rb

@@ -26,15 +26,16 @@ module Orchparty
       end
 
       def self.output(application)
-        {"version" => "2", 
+        output_hash = {"version" => "2", 
          "services" =>
         application.services.map do |name,service|
            service = service.to_h
            [service.delete(:name), HashUtils.deep_stringify_keys(service.to_h)]
          end.to_h,
-         "volumes" => transform_to_yaml(application.volumes),
-         "networks" => transform_to_yaml(application.networks),
-        }.to_yaml
+        }
+        output_hash["volumes"] = transform_to_yaml(application.volumes) if application.volumes && !application.volumes.empty?
+        output_hash["networks"] = transform_to_yaml(application.networks) if application.networks && !application.networks.empty?
+        output_hash.to_yaml
       end
     end
   end

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jannis Huebl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -90,7 +90,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dockerignore"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"

data/.dockerignore

@@ -1 +0,0 @@
-Dockerfile