skipjack 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4033894cd022ca99f6cc2bce186122bcc8365b9
-  data.tar.gz: 4e9da2a6c2acb659f01d0d84398873566314aae4
+  metadata.gz: 346e360f1203eaf442ccdbc7fd11459aaf177401
+  data.tar.gz: e219ec7484e6a1d6360bbf1cd60abae841a600bc
 SHA512:
-  metadata.gz: 5d5e1eacdb8c9bc0604befc9d049dad05a4934b7b0bd6a7f997a05c7aeaaad3aad3d765e250dbd2d0b4c69490737dff01d03a5edeca974dae511b01f99e3f97b
-  data.tar.gz: 4566ed52a8e07a58d6311e5fefc9bd183fd57f7ef0272be38f6def7f1e478fbdd9fee0317ad927297d7c3b569e1cf1e570e9019d497105f86106f55d3810c0c5
+  metadata.gz: 8f6ff2ad0d53c0d85b118be1a4637fa80f25c2a2bbd3f33ce95f8ee076b6380044ed86ae6bb3b44af85a509273183edd7d29015c3b6adb10819b7bf9f8c53d48
+  data.tar.gz: c740d7eb3781a01e22127aadb5b683e5d7cf5748a29d9b845b48faede73a933cb66be2f187634230d66e3d9985c6de65b1f38d629c66ea1669493263a783ad0b

data/CHANGELOG

@@ -0,0 +1,2 @@
+Version 0.0.2: Skip compilation if target is newer than sources
+Version 0.0.1: Compile F# source files

data/lib/skipjack/fsharp.rb

@@ -2,6 +2,7 @@ module Skipjack
   class FSharpCompiler
     attr_reader :target
     attr_accessor :output_folder, :output_file
+    attr_writer :references
 
     def initialize *args
       @args = *args
@@ -21,20 +22,34 @@ module Skipjack
       @source_files ||= []
     end
 
-    def create_task
-      Rake::Task::define_task *@args do |t|
+    def references
+      @references ||= []
+    end
+
+    def create_file_task
+      output_file_name = output_folder ? "#{output_folder}/#{output_file}" : output_file
+      dependencies = source_files
+      file_task = Rake::FileTask::define_task output_file_name => dependencies do |t|
         if t.application.windows?
           compiler = "fsc"
         else
           compiler = "fsharpc"
         end
 
-        out = output_folder ? "--out:#{output_folder}/#{output_file}" : "--out:#{output_file}"
+        out = "--out:#{output_file_name}"
         src = source_files.join(" ")
-        cmd = "#{compiler} #{out} --target:#{target.to_s} #{src}"
+        refs = references.each {|r| r.prepend("--reference:") }
+        refs = refs.join(" ")
+        cmd = "#{compiler} #{refs} #{out} --target:#{target.to_s} #{src}"
         raise "Error executing command" unless Kernel.system cmd
       end
     end
+
+    def create_task
+      task = Rake::Task::define_task *@args 
+      file_task = create_file_task
+      task.enhance [file_task]
+    end
   end
 end
 

data/lib/skipjack/version.rb

@@ -1,3 +1,3 @@
 module Skipjack
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/skipjack.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "fakefs"
   spec.add_dependency "rake"
 end

data/spec/helpers.rb

@@ -5,7 +5,7 @@ module Helpers
   end
 
   def expect_system_call 
-    expect(Kernel).to receive(:system) do |args|
+    allow(Kernel).to receive(:system) do |args|
       result = yield args
       if result.nil? then
         true
@@ -29,6 +29,7 @@ module Helpers
   class CompilerOptions
     attr_accessor :executable, :target, :out
     attr_writer :source_files
+    attr_writer :references
 
     def initialize
       yield self if block_given?
@@ -37,6 +38,10 @@ module Helpers
     def source_files
       @source_files ||= []
     end
+
+    def references
+      @reference ||= []
+    end
   end
 
   def parse_cmd cmd
@@ -54,6 +59,10 @@ module Helpers
         c.out = m[1]
       end
 
+      cmd.scan(/--reference:([^ ]*)/) do |m|
+        c.references << m[0]
+      end
+
       c.source_files = args.select { |f| f[0] != '-' }
     end
   end

data/spec/lib/skipjack/fsharp_spec.rb

@@ -1,7 +1,10 @@
+require 'fakefs/spec_helpers'
+
 describe 'fsharp' do
+  include FakeFS::SpecHelpers
+
   before :each do |example|
-    @app = Rake::Application.new
-    Rake.application = @app
+    @app = Rake.application = Rake::Application.new
 
     # mock if we are running windows or not
     windows = example.metadata[:windows]
@@ -25,6 +28,7 @@ describe 'fsharp' do
 
     let :options do
       invoke_fsc_task do |t|
+        t.output_file = "dummy.exe" # in case test doesn't set one up
         @setup.call(t) if @setup
       end
       @opts
@@ -42,6 +46,18 @@ describe 'fsharp' do
       end
     end
 
+    describe "--reference: argument" do
+      before do |ex|
+        @setup = lambda do |t|
+          t.references = ["ref1.dll", "ref2.dll"]
+        end
+      end
+
+      subject { options.references }
+
+      it { should eq ["ref1.dll", "ref2.dll"] }
+    end
+
     describe "--target: argument" do
       before do |ex|
         @setup = lambda do |t|
@@ -63,6 +79,8 @@ describe 'fsharp' do
     describe "source files" do
       it "contains the passed sources" do
         sources = ["source1.fs", "source2.fs"]
+        FileUtils.touch "source1.fs"
+        FileUtils.touch "source2.fs"
         @setup = lambda do |t|
           t.source_files = sources
         end
@@ -88,6 +106,33 @@ describe 'fsharp' do
         expect(options.out).to eq("p.exe")
       end
     end
+
+    describe "build optimization" do
+      context "build output is older than source files" do
+        it "calls the compiler", :focus => true do
+          FileUtils.touch('./p.exe')
+          FileUtils.touch('s.fs')
+          @setup = lambda do |t|
+            t.target = :exe
+            t.output_file = "p.exe"
+            t.source_files = ["s.fs"]
+          end
+          expect(options).to_not be_nil
+        end
+      end
+      context "build output is newer than source files" do
+        it "does not call the compiler", :focus => true do
+          FileUtils.touch('s.fs')
+          FileUtils.touch('./p.exe')
+          @setup = lambda do |t|
+            t.target = :exe
+            t.output_file = "p.exe"
+            t.source_files = ["s.fs"]
+          end
+          expect(options).to be_nil
+        end
+      end
+    end
   end
 
   describe "target type" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skipjack
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Peter Strøiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - Guardfile
 - LICENSE