emplace 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b144f6bb99df6ed689df617404919bb2ba11249d
-  data.tar.gz: a88cb236d52bd5ec904545fca8912571f7861fa7
+  metadata.gz: a19369de0e81e097444c4f2051ecdb68f1eb7d89
+  data.tar.gz: 6b7e1d5c808716b70647ba236d078f28b0d0fc05
 SHA512:
-  metadata.gz: 90367dc321118ecbc5023aa9daa100b64c5baee4b8801851699010855a4e7d8b7fd32c28ba3cc68a919732ebc926b19fcc3cdcb4e44f2359bd361781ce60a1fb
-  data.tar.gz: 93949f99b0da4a6762dad3153770fd8c47a4c522bd4214becb42d1a73116f896f570ecf0f925cedcff8f6068eb123ebf39cbb97ee71f97ee641bee7e08eb942c
+  metadata.gz: 64bab951484b11dd563c780d959dad949d098518142f89bdf179a3cd84cb4a5e969a06e6f19d11c6bf2a3ed858d824a4523850251701c7255f28f2bf6e51a8ea
+  data.tar.gz: 74a5cc73f81178e13bb220c262078788a34a7b3bbde065db6cb269da887578452bf5b36bf02cb9bec92a96ab1237b213a25f5c309c2a7b3f96a7125545d75f64

data/lib/emplace.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'open-uri'
 
 module Emplace
 
@@ -7,51 +8,63 @@ module Emplace
       @name = name
       @impl = impl
     end
+    def build_dir
+      'build'  
+    end
+    def dist_dir
+      'dist'
+    end
+    def vendor_dir
+      'vendor'
+    end
     def clean!
-      @impl.clean
+      FileUtils.rm_rf build_dir
+      FileUtils.rm_rf dist_dir
+      FileUtils.rm_rf vendor_dir
     end
     def cmake!
-      @impl.cmake @name
+      @impl.cmake @name, build_dir, dist_dir
     end
     def build!
-      @impl.build
+      @impl.build build_dir
     end
     def test!
-      @impl.test
+      @impl.test build_dir
     end
     def package!
-      @impl.package @name
+      @impl.package @name, dist_dir
+    end
+    def extract!
+      @impl.extract @name, vendor_dir
+    end
+    def fetch!(url)
+      package = @impl.package_name(@name)
+      source = open(File.join(url, package))
+      @impl.write_file(package, vendor_dir) {|dest|
+        IO.copy_stream(source, dest)
+      }
     end
   end
 
   class CMakeBuild
-    def build_dir
-      'build'  
-    end
-    def dist_dir
-      'dist'
-    end
-    def install_dir(name)
-      "#{dist_dir}/#{name}"
-    end
-    def cmake(name)
-      sh "cmake . -B#{build_dir} -DCMAKE_INSTALL_PREFIX=#{install_dir(name)} -G \"#{cmake_generator}\""
+    def cmake(name, build_dir, dist_dir)
+      sh "cmake . -B#{build_dir} -DCMAKE_INSTALL_PREFIX=#{dist_dir}/#{name} -G \"#{cmake_generator}\""
     end
-    def build
-      sh "cmake --build #{build_dir} --target install"
+    def build(dir)
+      sh "cmake --build #{dir} --target install"
     end
-    def test
-      sh "ctest --verbose", build_dir
-    end
-    def clean
-      FileUtils.rm_rf build_dir
-      FileUtils.rm_rf dist_dir
+    def test(dir)
+      sh "ctest --verbose", dir
     end
     def sh(cmd, dir = '.')
       Dir.chdir(dir) {
         raise $? unless system cmd
       }
     end
+    def write_file(name, dir, &block)
+      FileUtils.mkdir_p(dir)
+      File.open(File.join(dir, name), 'wb', &block)
+    end
   end
 
   class Unix < CMakeBuild
@@ -64,8 +77,11 @@ module Emplace
     def package_name(name)
       "#{name}-#{system_name}.tgz"
     end
-    def package(name)
-      sh "tar czf #{package_name(name)} #{name}", dist_dir
+    def package(name, dir)
+      sh "tar czf #{package_name(name)} #{name}", dir
+    end
+    def extract(name, dir)
+      sh "tar xzf #{package_name(name)}", dir
     end
   end
 
@@ -128,15 +144,18 @@ module Emplace
           "#{super}-msvc"
         end
       end
-      def build
+      def build(dir)
         if cfg = ENV['CONFIGURATION']
-          sh "cmake --build #{build_dir} --target install --config #{cfg}"
+          sh "cmake --build #{dir} --target install --config #{cfg}"
         else
           super
         end
       end
-      def package(name)
-        sh "7z a #{package_name(name)} #{name}", dist_dir
+      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
     }
   end

data/test/emplace-test.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 
 require 'emplace'
+require 'fileutils'
 
 ENV['CC'] = 'cc'
 ENV['CONFIGURATION'] = 'CFG'
@@ -29,11 +30,13 @@ class TestEmplace < Test::Unit::TestCase
     project.build!
     project.test!
     project.package!
+    project.extract!
     assert_equal [
       'cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=dist/foo -G "Unix Makefiles"',
       'cmake --build build --target install',
       'ctest --verbose',
-      'tar czf foo-linux-x86_64-cc.tgz foo'
+      'tar czf foo-linux-x86_64-cc.tgz foo',
+      'tar xzf foo-linux-x86_64-cc.tgz'
     ], travis.commands
   end
 
@@ -44,14 +47,48 @@ class TestEmplace < Test::Unit::TestCase
     project.build!
     project.test!
     project.package!
+    project.extract!
     assert_equal [
       'cmake . -Bbuild -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'
+      '7z a foo-win-x64-msvc-cfg.zip foo',
+      '7z x foo-win-x64-msvc-cfg.zip'
     ], appveyor.commands
   end
 
+  def testFetchTravis
+    FileUtils.mkdir_p 'url_source_dir'
+    FileUtils.mkdir_p 'vendor_test_dir'
+
+    File.write('url_source_dir/foo-linux-x86_64-cc.tgz', 'foo')
+
+    travis = Travis.new
+    project = Emplace::Project.new 'foo', travis
+    project.fetch! 'url_source_dir'
+
+    assert_equal 'foo', File.read('vendor/foo-linux-x86_64-cc.tgz') 
+  ensure 
+    FileUtils.rm_rf 'url_source_dir'
+    FileUtils.rm_rf 'vendor'
+  end
+
+  def testFetchAppVeyor
+    FileUtils.mkdir_p 'url_source_dir'
+    FileUtils.mkdir_p 'vendor'
+
+    File.write('url_source_dir/foo-win-x64-msvc-cfg.zip', 'foo')
+
+    appveyor = AppVeyor.new
+    project = Emplace::Project.new 'foo', appveyor
+    project.fetch! 'url_source_dir'
+
+    assert_equal 'foo', File.read('vendor/foo-win-x64-msvc-cfg.zip') 
+  ensure 
+    FileUtils.rm_rf 'url_source_dir'
+    FileUtils.rm_rf 'vendor'
+  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.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Ryan Calhoun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies: []
 description: Keeps settings for running cmake builds on Travis-CI and AppVeyor.
 email: