emplace 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8158bcce017c1025b1e02761b723075378c74da
-  data.tar.gz: d06d1fae6b5e89aaa3331e2e1222a0d1a23ccb0b
+  metadata.gz: 65d254de88cfa79c37429e9ed5265604ae0c13f0
+  data.tar.gz: dfd2d00dcbcc61ceefff90a47122ffff0e485251
 SHA512:
-  metadata.gz: 260be5c8b0783295e93943605d2a2b8719e643a6844255ee0f65898bdaf53409d029775d6470cd9a9477f890bf24a2a804081cf6a6b79a81d5508b00f7acd7c7
-  data.tar.gz: b8013900af59d44da9635c75bc07aa9314eb86d07604003b29575d2db874464d88d6255ea896e9d8541902592809294ef4bef2f5c7ecbe086448d0a4569fa5c1
+  metadata.gz: 6cace8085c721261221cc229027048048061c52c2a1de5cb758ae08ba2f547006772d67a296af1bc384781aa99854d0e71f6d060f62ba883f938b70132d3a4a0
+  data.tar.gz: 63002826a5a33275b78ef9c4ad6461bb3fd04b561dc5bc639033b266b3e8d6e9c6204deff837d0ee530b7398769d033e5dbedab9f8fbac0355dab1fa9cbefc13

data/README.md

@@ -21,9 +21,11 @@ Or install it yourself as:
 ## Usage
 
 	require 'emplace'
-	Emplace.cmake
-	Emplace.build
-	Emplace.package('package-name')
+	project = Emplace.new 'project-name'
+	project.cmake!
+	project.build!
+	project.test!
+	project.package!
 
 ## Contributing
 

data/lib/emplace.rb

@@ -1,14 +1,56 @@
+require 'fileutils'
+
 module Emplace
 
+  class Project
+    def initialize(name, impl = Emplace.load_env)
+      @name = name
+      @impl = impl
+    end
+    def clean!
+      @impl.clean
+    end
+    def cmake!
+      @impl.cmake @name
+    end
+    def build!
+      @impl.build
+    end
+    def test!
+      @impl.test
+    end
+    def package!
+      @impl.package @name
+    end
+  end
+
   class CmakeBuild
-    def cmake
-      sh "cmake -G \"#{cmake_generator}\" ."
+    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}\""
     end
     def build
-      sh "cmake --build . --target install"
+      sh "cmake --build #{build_dir} --target install"
+    end
+    def test
+      sh "ctest --verbose", build_dir
     end
-    def sh(cmd)
-      raise $? unless system cmd
+    def clean
+      FileUtils.rm_rf build_dir
+      FileUtils.rm_rf dist_dir
+    end
+    def sh(cmd, dir = '.')
+      Dir.chdir(dir) {
+        raise $? unless system cmd
+      }
     end
   end
 
@@ -23,7 +65,7 @@ module Emplace
       "#{name}-#{system_name}.tgz"
     end
     def package(name)
-      sh "tar czf #{package_name(name)} #{name}"
+      sh "tar czf #{package_name(name)} #{name}", dist_dir
     end
   end
 
@@ -84,19 +126,18 @@ module Emplace
     end
     def build
       if cfg = ENV['CONFIGURATION']
-        sh "cmake --build . --target install --config #{cfg}"
+        sh "cmake --build #{build_dir} --target install --config #{cfg}"
       else
         super
       end
     end
     def package(name)
-      sh "7z a #{package_name(name)} #{name}"
+      sh "7z a #{package_name(name)} #{name}", dist_dir
     end
   end
 
-  private
   def self.load_env
-    platform = case RUBY_PLATFORM
+    case RUBY_PLATFORM
     when /mswin|mingw/
       Windows
     when /darwin/
@@ -105,21 +146,14 @@ module Emplace
       Linux
     else
       Unix
-    end
-
-    if ENV['TRAVIS']
-      platform.send(:include, Travis)
-    elsif ENV['APPVEYOR']
-      platform.send(:include, AppVeyor) 
-    end
-
-    platform.new.tap {|impl|
-      (impl.methods - Object.methods).each {|m|
-        define_singleton_method(m) {|*args,&block| impl.method(m).call(*args, &block) }
-      }
-    }
+    end.tap {|platform|
+      if ENV['TRAVIS']
+        platform.send(:include, Travis)
+      elsif ENV['APPVEYOR']
+        platform.send(:include, AppVeyor) 
+      end
+    }.new
   end
 
-  IMPL = load_env
 end
 

data/test/emplace-test.rb

@@ -22,18 +22,56 @@ class TestEmplace < Test::Unit::TestCase
     assert_equal 'Visual Studio 14 Win64', AppVeyor.new.cmake_generator
   end
 
+  def testProjectTravis
+    travis = Travis.new
+    project = Emplace::Project.new 'foo', travis
+    project.cmake!
+    project.build!
+    project.test!
+    project.package!
+    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'
+    ], travis.commands
+  end
+
+  def testProjectAppVeyor
+    appveyor = AppVeyor.new
+    project = Emplace::Project.new 'foo', appveyor
+    project.cmake!
+    project.build!
+    project.test!
+    project.package!
+    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'
+    ], appveyor.commands
+  end
+
   class Travis < Emplace::Linux
+    attr_reader :commands
     include Emplace::Travis
     def arch
       'x86_64'
     end
+    def sh(cmd, dir='')
+      (@commands ||= []) << cmd
+    end
   end
 
   class AppVeyor < Emplace::Windows
+    attr_reader :commands
     include Emplace::AppVeyor
     def arch
       'x64'
     end
+    def sh(cmd, dir='')
+      (@commands ||= []) << cmd
+    end
   end
 
 end

metadata

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