emplace 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d254de88cfa79c37429e9ed5265604ae0c13f0
-  data.tar.gz: dfd2d00dcbcc61ceefff90a47122ffff0e485251
+  metadata.gz: b144f6bb99df6ed689df617404919bb2ba11249d
+  data.tar.gz: a88cb236d52bd5ec904545fca8912571f7861fa7
 SHA512:
-  metadata.gz: 6cace8085c721261221cc229027048048061c52c2a1de5cb758ae08ba2f547006772d67a296af1bc384781aa99854d0e71f6d060f62ba883f938b70132d3a4a0
-  data.tar.gz: 63002826a5a33275b78ef9c4ad6461bb3fd04b561dc5bc639033b266b3e8d6e9c6204deff837d0ee530b7398769d033e5dbedab9f8fbac0355dab1fa9cbefc13
+  metadata.gz: 90367dc321118ecbc5023aa9daa100b64c5baee4b8801851699010855a4e7d8b7fd32c28ba3cc68a919732ebc926b19fcc3cdcb4e44f2359bd361781ce60a1fb
+  data.tar.gz: 93949f99b0da4a6762dad3153770fd8c47a4c522bd4214becb42d1a73116f896f570ecf0f925cedcff8f6068eb123ebf39cbb97ee71f97ee641bee7e08eb942c

data/lib/emplace.rb

@@ -24,7 +24,7 @@ module Emplace
     end
   end
 
-  class CmakeBuild
+  class CMakeBuild
     def build_dir
       'build'  
     end
@@ -54,7 +54,7 @@ module Emplace
     end
   end
 
-  class Unix < CmakeBuild
+  class Unix < CMakeBuild
     def cmake_generator
       'Unix Makefiles'
     end
@@ -81,7 +81,7 @@ module Emplace
     end
   end
 
-  class Windows < CmakeBuild
+  class Windows < CMakeBuild
     def system_name
       "win-#{arch}"
     end
@@ -90,54 +90,59 @@ module Emplace
     end
   end
 
-  module Travis
-    def system_name
-      if cc = ENV['CC']
-        "#{super}-#{cc}"
-      else
-        super
+  private
+  def self.travis(base)
+    Class.new(base) {
+      def system_name
+        if cc = ENV['CC']
+          "#{super}-#{cc}"
+        else
+          super
+        end
       end
-    end
+    }
   end
 
-  module AppVeyor
-    def cmake_generator
-      case arch
-      when 'x86'
-        'Visual Studio 14'
-      when 'x64'
-        'Visual Studio 14 Win64'
+  def self.appveyor(base)
+    Class.new(base) {
+      def cmake_generator
+        case arch
+        when 'x86'
+          'Visual Studio 14'
+        when 'x64'
+          'Visual Studio 14 Win64'
+        end
       end
-    end
-    def arch
-      case ENV['PLATFORM']
-      when'x64'
-        'x64'
-      else
-        'x86'
+      def arch
+        case ENV['PLATFORM']
+        when'x64'
+          'x64'
+        else
+          'x86'
+        end
       end
-    end
-    def system_name
-      if cfg = ENV['CONFIGURATION']
-        "#{super}-msvc-#{cfg.downcase}"
-      else
-        "#{super}-msvc"
+      def system_name
+        if cfg = ENV['CONFIGURATION']
+          "#{super}-msvc-#{cfg.downcase}"
+        else
+          "#{super}-msvc"
+        end
       end
-    end
-    def build
-      if cfg = ENV['CONFIGURATION']
-        sh "cmake --build #{build_dir} --target install --config #{cfg}"
-      else
-        super
+      def build
+        if cfg = ENV['CONFIGURATION']
+          sh "cmake --build #{build_dir} --target install --config #{cfg}"
+        else
+          super
+        end
       end
-    end
-    def package(name)
-      sh "7z a #{package_name(name)} #{name}", dist_dir
-    end
+      def package(name)
+        sh "7z a #{package_name(name)} #{name}", dist_dir
+      end
+    }
   end
 
   def self.load_env
-    case RUBY_PLATFORM
+    platform = case RUBY_PLATFORM
     when /mswin|mingw/
       Windows
     when /darwin/
@@ -146,13 +151,15 @@ module Emplace
       Linux
     else
       Unix
-    end.tap {|platform|
-      if ENV['TRAVIS']
-        platform.send(:include, Travis)
-      elsif ENV['APPVEYOR']
-        platform.send(:include, AppVeyor) 
-      end
-    }.new
+    end
+
+    if ENV['TRAVIS']
+      travis platform
+    elsif ENV['APPVEYOR']
+      appveyor platform
+    else
+      platform
+    end.new
   end
 
 end

data/test/emplace-test.rb

@@ -52,9 +52,8 @@ class TestEmplace < Test::Unit::TestCase
     ], appveyor.commands
   end
 
-  class Travis < Emplace::Linux
+  class Travis < Emplace.send(:travis, Emplace::Linux)
     attr_reader :commands
-    include Emplace::Travis
     def arch
       'x86_64'
     end
@@ -63,9 +62,8 @@ class TestEmplace < Test::Unit::TestCase
     end
   end
 
-  class AppVeyor < Emplace::Windows
+  class AppVeyor < Emplace.send(:appveyor, Emplace::Windows)
     attr_reader :commands
-    include Emplace::AppVeyor
     def arch
       'x64'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emplace
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Ryan Calhoun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies: []
 description: Keeps settings for running cmake builds on Travis-CI and AppVeyor.
 email: