gordon 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b94b6c833eb2861fc1812fd735636616d07f51ac
-  data.tar.gz: b9f06696a7edd532fb343e4c3a184744b6a8ab9e
+  metadata.gz: e387d6a84bd0ece96fcb121d5cced6827ef009e1
+  data.tar.gz: e097dc48d7ba2bb4ec8ff51c99acd01fc293a8ab
 SHA512:
-  metadata.gz: 445412f2ba34785a24825b292811bf835677bfa106f9fa1e97e7e45c0ab4d6a962fa7a2bfe1b8128311dc6de97ac3cf2491c2bcd39eaa83cd18952e87e68288f
-  data.tar.gz: 32a14736b4795a14a46b46d426b8322512f8866cc11d7d74e0a8cd9edbc3c6a7b42e461ae652b96414d5649b0328ad6a97fdb441ff705674fdff41211b91dec8
+  metadata.gz: 8bc452a000d48d86f71432d503576078e81bc4fb3e565921265ff6b9b52bbadc438a231a95c3284fab283d565b1b6271448eeac08a6c17661246d91887bffb37
+  data.tar.gz: 020661459f394a86c7ba8ab9ea701407c8ac774088ee2a254c70a1abc382cbda843e9c5179eff7e3b2e74740c108109945cd40ff6907dd83bd7aff8b934a5360

data/lib/gordon/cookery/dependency_resolver.rb

@@ -25,7 +25,11 @@ module Gordon
           # TODO: get a way to handle openjdk
           runtime_name = :jre
 
-          runtime_version = "#{runtime_name}#{env_vars.runtime_version}"
+          if damn_oracle_8_jre?(env_vars.runtime_version)
+            runtime_version = "#{runtime_name}#{env_vars.runtime_version}"
+          else
+            runtime_version = "#{runtime_name} = #{env_vars.runtime_version}"
+          end
         else
           runtime_name = app_runtime
 
@@ -35,6 +39,10 @@ module Gordon
         runtime_version
       end
 
+      def damn_oracle_8_jre?(runtime_version)
+        runtime_version[2].to_s == '8'
+      end
+
       def get_http_server_package_name(env_vars)
         get_os_package_name(env_vars, :http_server_type)
       end

data/lib/gordon/version.rb

@@ -1,3 +1,3 @@
 module Gordon
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/gordon/cookery/dependency_resolver_spec.rb

@@ -47,12 +47,28 @@ describe Gordon::Cookery::DependencyResolver do
       it 'returns all dependencies for web' do
         expect(env_vars).to receive(:app_type).and_return("java_web_app")
         allow(env_vars).to receive(:http_server_type).and_return("apache")
-        expect(env_vars).to receive(:runtime_version).and_return("1.7.0_60")
+        allow(env_vars).to receive(:runtime_version).and_return("1.7.0_60")
         allow(env_vars).to receive(:web_server_type).and_return("tomcat")
         expect(env_vars).to receive(:init_type).and_return("")
 
         expected = [
-          "jre1.7.0_60",
+          "jre = 1.7.0_60",
+          "httpd",
+          "tomcat",
+        ]
+
+        expect(subject.resolve_dependencies(env_vars)).to eq(expected)
+      end
+
+      it 'handles damn Oracle JRE 8 package name' do
+        expect(env_vars).to receive(:app_type).and_return("java_web_app")
+        allow(env_vars).to receive(:http_server_type).and_return("apache")
+        allow(env_vars).to receive(:runtime_version).and_return("1.8.0_25")
+        allow(env_vars).to receive(:web_server_type).and_return("tomcat")
+        expect(env_vars).to receive(:init_type).and_return("")
+
+        expected = [
+          "jre1.8.0_25",
           "httpd",
           "tomcat",
         ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gordon
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Marcelo Pinheiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake