emplace 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 616eaccd78562d8b95c0d0417a48c41a1e95e023
-  data.tar.gz: d026c50acace19c59eeda2f833d6ea545a6b6703
+  metadata.gz: dd4b86910331878cd8f5b88e19f73edc539fea6e
+  data.tar.gz: a1d034c9b52dc31bdaea329d4a06a20287bb8f75
 SHA512:
-  metadata.gz: a283d879606a1f7d5e578fec01dd2bc008fffe1cf69392b5d456d0563fde9abbba698deaa85f55a60a5cdcd3d2dd2d2262e40fcb86a4c8a180371cf01b9e3cc2
-  data.tar.gz: 485f717f7f0661001be8f23a310f8911d9c93c341c1e021c92b9fcb4261f37445ebc0e436c054c8725bafb35187bd6594db4e9fe4dee5bca846dc19fccccba51
+  metadata.gz: 3ffc15e87bf4e5c1b4aae44a896819bd4f54c40aaada9f656fe83a3436a8180233dc7cec6f140d5f6c3e534cb8830c98c46cdd9f95d3100a7ec699e35071471f
+  data.tar.gz: fce93cfc5f15bd4805e050e825d0131b421e18995849a88f7f8c23b7787b56b8bfa6df095b244e31a85cfbae28a232f6e18fb96a62c1d31d7356762b78258b72

data/lib/emplace.rb

@@ -3,8 +3,9 @@ require 'fileutils'
 module Emplace
 
   class Project
-    def initialize(name, impl = Emplace.load_env)
+    def initialize(name, opts = {}, impl = Emplace.load_env)
       @name = name
+      @opts = opts
       @impl = impl
     end
     def module_dir
@@ -39,14 +40,12 @@ module Emplace
     def extract!
       @impl.extract @name, vendor_dir
     end
-    def fetch!(url)
-      package = @impl.package_name(@name)
-
-      IO.popen(['curl', '-fsSL', File.join(url, package)]) {|source|
-        @impl.write_file(package, vendor_dir) {|dest|
-          IO.copy_stream(source, dest)
-        }
-      }
+    def fetch!
+      @impl.fetch(@name, @opts, vendor_dir)
+    end
+    private
+    def fetch_url
+      @impl.fetch_url(@opts[:url], @opts[:version])
     end
   end
 
@@ -65,6 +64,16 @@ module Emplace
         raise $? unless system cmd
       }
     end
+    def fetch(name, opts, vendor_dir)
+      package = package_name(name)
+      url = File.join(opts[:url], opts[:version])
+
+      IO.popen(['curl', '-fsSL', File.join(url, package)]) {|source|
+        write_file(package, vendor_dir) {|dest|
+          IO.copy_stream(source, dest)
+        }
+      }
+    end
     def write_file(name, dir, &block)
       FileUtils.mkdir_p(dir)
       File.open(File.join(dir, name), 'wb', &block)
@@ -102,15 +111,59 @@ module Emplace
   end
 
   class Windows < CMakeBuild
+    def cmake_generator
+      case arch
+      when 'x86'
+        'Visual Studio 14'
+      when 'x64'
+        'Visual Studio 14 Win64'
+      end
+    end
+    def arch
+      case platform
+      when'x64'
+        'x64'
+      else
+        'x86'
+      end
+    end
+    def system_name
+      "#{super}-msvc"
+    end
+    def build(dir)
+      sh "cmake --build #{dir} --target install --config #{configuration}"
+    end
+    def package(name, dir)
+      sh "7z a #{package_name(name)} #{name}", dir
+    end
+    def extract(name, dir)
+      sh "7z x #{package_name(name)}", dir
+    end
     def system_name
       "win-#{arch}"
     end
     def package_name(name)
       "#{name}-#{system_name}.zip"
     end
+    def platform
+      ENV['PLATFORM'] || 'x64'
+    end
+    def configuration
+      ENV['CONFIGURATION'] || 'Debug'
+    end
   end
 
   private
+
+  def self.local(base)
+    Class.new(base) {
+      def fetch(name, opts, vendor_dir)
+        FileUtils.mkdir_p(vendor_dir)
+        FileUtils.cp "../#{name}/dist/#{package_name(name)}", vendor_dir        
+      end
+    }
+  end
+
   def self.travis(base)
     Class.new(base) {
       def system_name
@@ -125,41 +178,8 @@ module Emplace
 
   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
-      def arch
-        case ENV['PLATFORM']
-        when'x64'
-          'x64'
-        else
-          'x86'
-        end
-      end
       def system_name
-        if cfg = ENV['CONFIGURATION']
-          "#{super}-msvc-#{cfg.downcase}"
-        else
-          "#{super}-msvc"
-        end
-      end
-      def build(dir)
-        if cfg = ENV['CONFIGURATION']
-          sh "cmake --build #{dir} --target install --config #{cfg}"
-        else
-          super
-        end
-      end
-      def package(name, dir)
-        sh "7z a #{package_name(name)} #{name}", dir
-      end
-      def extract(name, dir)
-        sh "7z x #{package_name(name)}", dir
+        "#{super}-msvc-#{configuration.downcase}"
       end
     }
   end
@@ -181,7 +201,7 @@ module Emplace
     elsif ENV['APPVEYOR']
       appveyor platform
     else
-      platform
+      local platform
     end.new
   end
 

data/test/emplace-test.rb

@@ -25,14 +25,14 @@ class TestEmplace < Test::Unit::TestCase
 
   def testProjectTravis
     travis = Travis.new
-    project = Emplace::Project.new 'foo', travis
+    project = Emplace::Project.new 'foo', {}, travis
     project.cmake!
     project.build!
     project.test!
     project.package!
     project.extract!
     assert_equal [
-      'cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=dist/foo -G "Unix Makefiles"',
+      "cmake . -Bbuild -DCMAKE_MODULE_PATH=#{modpath} -DCMAKE_INSTALL_PREFIX=dist/foo -G \"Unix Makefiles\"",
       'cmake --build build --target install',
       'ctest --verbose',
       'tar czf foo-linux-x86_64-cc.tgz foo',
@@ -42,14 +42,14 @@ class TestEmplace < Test::Unit::TestCase
 
   def testProjectAppVeyor
     appveyor = AppVeyor.new
-    project = Emplace::Project.new 'foo', appveyor
+    project = Emplace::Project.new 'foo', {}, appveyor
     project.cmake!
     project.build!
     project.test!
     project.package!
     project.extract!
     assert_equal [
-      'cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=dist/foo -G "Visual Studio 14 Win64"',
+      "cmake . -Bbuild -DCMAKE_MODULE_PATH=#{modpath} -DCMAKE_INSTALL_PREFIX=dist/foo -G \"Visual Studio 14 Win64\"",
       'cmake --build build --target install --config CFG',
       'ctest --verbose',
       '7z a foo-win-x64-msvc-cfg.zip foo',
@@ -58,14 +58,14 @@ class TestEmplace < Test::Unit::TestCase
   end
 
   def testFetchTravis
-    FileUtils.mkdir_p 'url_source_dir'
+    FileUtils.mkdir_p 'url_source_dir/1.0'
     FileUtils.mkdir_p 'vendor_test_dir'
 
-    File.write('url_source_dir/foo-linux-x86_64-cc.tgz', 'foo')
+    File.write('url_source_dir/1.0/foo-linux-x86_64-cc.tgz', 'foo')
 
     travis = Travis.new
-    project = Emplace::Project.new 'foo', travis
-    project.fetch! "file://#{FileUtils.pwd}/url_source_dir"
+    project = Emplace::Project.new 'foo', {url: "file://#{FileUtils.pwd}/url_source_dir", version: '1.0'}, travis
+    project.fetch!
 
     assert_equal 'foo', File.read('vendor/foo-linux-x86_64-cc.tgz')
   ensure
@@ -74,14 +74,14 @@ class TestEmplace < Test::Unit::TestCase
   end
 
   def testFetchAppVeyor
-    FileUtils.mkdir_p 'url_source_dir'
+    FileUtils.mkdir_p 'url_source_dir/1.0'
     FileUtils.mkdir_p 'vendor'
 
-    File.write('url_source_dir/foo-win-x64-msvc-cfg.zip', 'foo')
+    File.write('url_source_dir/1.0/foo-win-x64-msvc-cfg.zip', 'foo')
 
     appveyor = AppVeyor.new
-    project = Emplace::Project.new 'foo', appveyor
-    project.fetch! "file://#{FileUtils.pwd}/url_source_dir"
+    project = Emplace::Project.new 'foo', {url: "file://#{FileUtils.pwd}/url_source_dir", version: '1.0'}, appveyor
+    project.fetch!
 
     assert_equal 'foo', File.read('vendor/foo-win-x64-msvc-cfg.zip')
   ensure
@@ -89,6 +89,10 @@ class TestEmplace < Test::Unit::TestCase
     FileUtils.rm_rf 'vendor'
   end
 
+  def modpath
+      File.join(File.dirname(File.dirname(__FILE__)), 'modules')
+  end
+
   class Travis < Emplace.send(:travis, Emplace::Linux)
     attr_reader :commands
     def arch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emplace
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Calhoun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies: []
 description: Keeps settings for running cmake builds on Travis-CI and AppVeyor.
 email:
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gem for cmake build settings