minke 1.9.6 → 1.9.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTM2YWQ1OGZmODk2ZGRiNjQ0MzNjNTdmMDBiNTczYjVhNGQyZjYwYw==
+    ZmE2OGE0OGIwNzIxOGFmOGJhNDZkMzI3NGY2M2I4YjA0ZjNjZjE0YQ==
   data.tar.gz: !binary |-
-    ZjNkNTJiODVmMjdiNzM5N2IyNWMxNjY0M2FkNzMwYjZhMTRjY2I5NA==
+    Y2I5NjY2YmQxYzEwZmRlNmJiYmU4YTdmMDllNzEzOWY2YWRlNTk5OQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2E3NjliMjBkNDU4ZDRjMTEyNjcyODJiYWZlMGVkMGNlMTYzZjM0ZTZjNmQ0
-    YWNlN2MzYWVhOTgyZDZhOGI4MDk4MTNiMmRiYjRlYjNhNTkxMzhiMmM1Zjhj
-    MmU2NTVkNjIyNzI0OGFmY2RhNTFhOWUzYzQyMzcyN2QwNTlkYTM=
+    Y2ZmYjMwNjliYWM0MDViOWNiZGI2NTg4NzhjNWM0N2JhM2FlOWVmOWExNjQy
+    ZDY2OTYxNjRhYmFkZWMzNTkzMjM0ZjEzNDg5N2QzMzNjMmU4OWQ2OWM1NjA5
+    YjIwYjhlMDQ0OGRlZmQ0ZDc0MTI0ZDdkM2E2ZjVkNzMyZTFjZWU=
   data.tar.gz: !binary |-
-    NWM5ZGM1MTk3ZGU5MDEyYmMwMzUxM2Y2OTFiYTJmMDBiMTlkNmZiNTA5M2Mx
-    YThmYjk0MWNjNTkxYWQyMTM4OTA0Yjk5OTBjOTVkY2M1MTQxOTc0ZTA0YzFi
-    OTkzYjM0NDJjYzQwNDgwNWNkNjU2OTYzMjU1YWU4ODY1YzQ5NGE=
+    OTYxNzE2YTJlNjA1ZWQyMWE4NDQyMzViZTQ2YzMyNmYyOTc2N2NkYjU4Mjdm
+    Yzg2MjE5ZDg2ZWM0ZjJmOTU4OTcxYmE2Y2RlYzhlZmYzYzhiNDQzODY3N2Vk
+    NDg3Mzc5MTQ0MzUyNGQ4NWY4NjhkMDA3ZTdkNTQ5MTI4YThjZWU=

data/Gemfile

@@ -6,4 +6,4 @@ gemspec
 gem "codeclimate-test-reporter", group: :test, require: nil
 #gem 'minke-generator-go', :path => '/Users/nicj/Developer/gems/minke-generator-go'
 #gem 'minke-generator-node', :path => '/Users/nicj/Developer/gems/minke-generator-node'
-#gem 'minke-generator-spring', :github => 'notonthehighstreet/minke-generator-spring', :branch => 'master'
+#gem 'minke-generator-spring', :path => '/Users/nicj/Developer/gems/minke-generator-spring'

data/docker/Dockerfile

@@ -4,13 +4,11 @@ ENV COMPOSE_VERSION 1.7.1
 ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN apt-get update
-RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems
+RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates
 
 RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && curl -L get.rvm.io | bash -s stable --ruby=2.3.1 --with-gems="bundle"
 
-RUN apt-get update -q \
-	&& apt-get install -y -q --no-install-recommends curl ca-certificates \
-	&& curl -o /usr/local/bin/docker-compose -L \
+RUN curl -o /usr/local/bin/docker-compose -L \
 		"https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" \
 	&& chmod +x /usr/local/bin/docker-compose
 

data/docker/Gemfile

@@ -11,3 +11,4 @@ gem 'minke'
 gem 'minke-generator-swift'
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go'
+gem 'minke-generator-spring'

data/lib/minke/docker/service_discovery.rb

@@ -20,7 +20,7 @@ module Minke
         begin
           ip = @docker_runner.get_docker_ip_address
           container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
-          ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port }.first
+          ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port.to_i }.first
         rescue
           raise "Unable to find public address for '#{service_name}' on port #{private_port}"
         end

data/lib/minke/tasks/task.rb

@@ -93,12 +93,6 @@ module Minke
         elsif url.type == 'public'
           address = @service_discovery.public_address_for url.address, url.port
 
-          # if running on docker for mac we need to replace the ip address with the docker hosts
-          ip = @docker_runner.get_docker_ip_address
-          if  ip != "127.0.0.1" && ip != "0.0.0.0" && ip != nil
-            address.gsub!('0.0.0.0', ip)
-          end
-
           "#{url.protocol}://#{address}#{url.path}"
         end
       end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.9.6"
+  VERSION = "1.9.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors:
 - Nic Jackson