skipjack 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 346e360f1203eaf442ccdbc7fd11459aaf177401
-  data.tar.gz: e219ec7484e6a1d6360bbf1cd60abae841a600bc
+  metadata.gz: e197313df74648d36c9608a97523791d2982d239
+  data.tar.gz: 9e0d38d5fd325164bf6975b79beb768e90dd75eb
 SHA512:
-  metadata.gz: 8f6ff2ad0d53c0d85b118be1a4637fa80f25c2a2bbd3f33ce95f8ee076b6380044ed86ae6bb3b44af85a509273183edd7d29015c3b6adb10819b7bf9f8c53d48
-  data.tar.gz: c740d7eb3781a01e22127aadb5b683e5d7cf5748a29d9b845b48faede73a933cb66be2f187634230d66e3d9985c6de65b1f38d629c66ea1669493263a783ad0b
+  metadata.gz: e0a3059a796649cf21344eaacf2e872bafd39752906d49e0cfe4e5dcd20cdd3be3bd943660fbb941f570952ff1a5549a26eec828a93e18776337d6c156dfd283
+  data.tar.gz: 4743affd7b7db28f0a2c08e72600d567f89733b4bf194e96445000ba5ab3e723710033a75ae5bff12ad0651445a896488d2eff754841b9de743a33bbd499abcf

data/lib/skipjack/fsharp.rb

@@ -1,7 +1,6 @@
 module Skipjack
   class FSharpCompiler
     attr_reader :target
-    attr_accessor :output_folder, :output_file
     attr_writer :references
 
     def initialize *args
@@ -26,29 +25,27 @@ module Skipjack
       @references ||= []
     end
 
-    def create_file_task
-      output_file_name = output_folder ? "#{output_folder}/#{output_file}" : output_file
+    def create_file_task *args
       dependencies = source_files
-      file_task = Rake::FileTask::define_task output_file_name => dependencies do |t|
+      file_task = Rake::FileTask::define_task *args do |t|
         if t.application.windows?
           compiler = "fsc"
         else
           compiler = "fsharpc"
         end
 
-        out = "--out:#{output_file_name}"
+        out = "--out:#{t.name}"
         src = source_files.join(" ")
         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
+      file_task.enhance dependencies
     end
 
     def create_task
-      task = Rake::Task::define_task *@args 
-      file_task = create_file_task
-      task.enhance [file_task]
+      create_file_task *@args
     end
   end
 end

data/lib/skipjack/version.rb

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

data/spec/lib/skipjack/fsharp_spec.rb

@@ -17,20 +17,22 @@ describe 'fsharp' do
   context "when a task is not executed" do
     it "does not call the system" do
       expect_no_system_call
-      @task = fsc :build 
+      @task = fsc "dummy.exe"
     end
   end
 
   describe "command line args" do
     before :each do 
-      expect_compiler_call { |opts| @opts = opts }
+      expect_compiler_call do |opts|
+        @opts = opts 
+      end
     end
 
     let :options do
-      invoke_fsc_task do |t|
-        t.output_file = "dummy.exe" # in case test doesn't set one up
+      task = fsc "dummy.exe" do |t|
         @setup.call(t) if @setup
       end
+      task.invoke
       @opts
     end
 
@@ -90,20 +92,11 @@ describe 'fsharp' do
 
     describe "output" do
       it "sets the output file" do
-        @setup = lambda do |t|
-          t.output_folder = "f"
-          t.output_file = "p.exe"
-        end
-        expect(options.out).to eq("f/p.exe")
-      end
-    end
-
-    context "when folder not specified" do
-      it "sets the output file" do
-        @setup = lambda do |t|
-          t.output_file = "p.exe"
+        task = fsc "f/p.exe" do |t|
+          @setup.call(t) if @setup
         end
-        expect(options.out).to eq("p.exe")
+        task.invoke
+        expect(@opts.out).to eq("f/p.exe")
       end
     end
 
@@ -112,24 +105,24 @@ describe 'fsharp' do
         it "calls the compiler", :focus => true do
           FileUtils.touch('./p.exe')
           FileUtils.touch('s.fs')
-          @setup = lambda do |t|
+          task = fsc "p.exe" do |t|
             t.target = :exe
-            t.output_file = "p.exe"
             t.source_files = ["s.fs"]
           end
-          expect(options).to_not be_nil
+          task.invoke
+          expect(@opts).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|
+          task = fsc "p.exe" do |t|
             t.target = :exe
-            t.output_file = "p.exe"
             t.source_files = ["s.fs"]
           end
-          expect(options).to be_nil
+          task.invoke
+          expect(@opts).to be_nil
         end
       end
     end
@@ -138,11 +131,11 @@ describe 'fsharp' do
   describe "target type" do
     it "fails when using invalid target option" do
       op = lambda do
-        invoke_fsc_task do |t|
+        task = fsc "p.exe" do |t|
           t.target = :invalid_option
         end
       end
-      expect(op).to raise_error
+      expect(op).to raise_error(/^Invalid target/)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skipjack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Peter Strøiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler