skipjack 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb9abf2582ba7c6272ee0a2e7e4e68fa1adfb66
-  data.tar.gz: 7d2a1174d871fdd42b32eaf8919f3b920686e118
+  metadata.gz: d5fcc6d5aff0dad590340067dc7a1bd195ad41a5
+  data.tar.gz: 1ce0cb7e4b1ac954d416b6771a2fc0dc629f69b7
 SHA512:
-  metadata.gz: 4ab0948f509da6eb6e54266e31292e9855ed0d51ae98eb2a1864ceb063dd2d1b36b32fffdbe88c268b4d3b498362c275011734881567e5573f67fcbadede3eeb
-  data.tar.gz: 42a53aa73621cbe99a18135430411030106907f61a311bdc6bee7de3ff4c9807c69940c204b5975a75b88c4c9ab8b95fd0067ad3fe0a3d904f801add96e33987
+  metadata.gz: 072b51ee79024a50ff7ff26e7b455c618da47cbed3a4959436bd5f2182310d789d4e6c312dd490ff3f37c3018b3324ec47eeae5da3473914422c802bf1fa050f
+  data.tar.gz: f7ffeba7239c2affe10da9d276a2b46130a89c4021c3e095ffa6b29e576df6c6b1f6907ab7d66db5081b75514c24b3d717a0852f3fc46ae5931e249148f184aa

data/lib/skipjack/fsharp.rb

@@ -45,6 +45,13 @@ module Skipjack
           compiler = "fsharpc"
         end
 
+        target = self.target
+        case File.extname(t.name) 
+        when ".exe"
+          target = :exe 
+        when ".dll"
+          target = :library 
+        end unless target
         opts = []
         opts << "--out:#{t.name}"
         opts << "--target:#{target.to_s}"
@@ -56,6 +63,7 @@ module Skipjack
         dir = File.dirname(t.name)
 
         cmd = "#{compiler} #{opts.join(" ")} #{source_files.join(" ")}"
+        puts cmd
         raise "Error executing command" unless Kernel.system cmd
       end
       file_task.enhance dependencies

data/lib/skipjack/version.rb

@@ -1,3 +1,3 @@
 module Skipjack
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/lib/skipjack/fsharp_spec.rb

@@ -14,84 +14,99 @@ describe 'fsharp' do
     allow(Kernel).to receive(:system).and_return true
   end
 
-  context "when a task is not executed" do
+  context "when a task is not invoked" do
     it "does not call the system" do
       expect_no_system_call
-      @task = fsc "dummy.exe"
+      fsc "dummy.exe"
     end
   end
 
-  describe "command line args" do
-    before :each do 
-      expect_compiler_call do |opts|
-        @opts = opts 
-      end
+  describe "called executable" do
+    subject do
+      opts = invoke_fsc
+      opts.executable
     end
 
-    let :options do
-      task = fsc "dummy.exe" do |t|
-        @setup.call(t) if @setup
-      end
-      task.invoke
-      @opts
+    context "when running on windows", windows: true do
+      it { should eq "fsc" }
     end
 
-    describe "called executable" do
-      subject { options.executable }
+    context "when running on non-windows", windows: false do
+      it { should eq "fsharpc" }
+    end
+  end
 
-      context "when running on windows", windows: true do
-        it { should eq "fsc" }
+  describe "--reference: argument" do
+    before do |ex|
+      @opts = invoke_fsc do |t|
+        t.references = ["ref1.dll", "ref2.dll"]
       end
+    end
+
+    subject { @opts.references }
 
-      context "when running on non-windows", windows: false do
-        it { should eq "fsharpc" }
+    it { should eq ["ref1.dll", "ref2.dll"] }
+  end
+
+  describe "--resident" do
+    before do |ex|
+      @opts = invoke_fsc do |t|
+        t.resident = ex.metadata[:resident] unless ex.metadata[:resident].nil?
       end
     end
 
-    describe "--reference: argument" do
-      before do |ex|
-        @setup = lambda do |t|
-          t.references = ["ref1.dll", "ref2.dll"]
-        end
+    subject { @opts.resident }
+
+    context "resident is not set" do
+      it "defaults to true" do
+        expect(subject).to eq true
       end
+    end
 
-      subject { options.references }
+    context "resident set to true", resident: true do
+      it { should eq true }
+    end
 
-      it { should eq ["ref1.dll", "ref2.dll"] }
+    context "resident set to false", resident: false do
+      it { should eq false }
     end
+  end
 
-    describe "--resident" do
+  describe "--target: argument" do
+    describe "output file is an .dll file" do
       before do |ex|
-        @setup = lambda do |t|
-          t.resident = ex.metadata[:resident] unless ex.metadata[:resident].nil?
+        @opts = invoke_fsc "dummy.dll" do |t|
+          t.target = ex.metadata[:target] unless ex.metadata[:target].nil?
         end
       end
 
-      subject { options.resident }
+      subject { @opts.target }
 
-      context "resident is not set" do
-        it "defaults to true" do
-          expect(subject).to eq true
-        end
+      context "when target not set" do
+        it { should eq "library" }
       end
 
-      context "resident set to true", resident: true do
-        it { should eq true }
+      context "when target = :library", target: :library do
+        it { should eq "library" }
       end
 
-      context "resident set to false", resident: false do
-        it { should eq false }
+      context "when target = :exe", target: :exe do
+        it { should eq "exe" }
       end
     end
 
-    describe "--target: argument" do
+    describe "output file is an .exe file" do
       before do |ex|
-        @setup = lambda do |t|
-          t.target = ex.metadata[:target]
+        @opts = invoke_fsc "dummy.exe" do |t|
+          t.target = ex.metadata[:target] unless ex.metadata[:target].nil?
         end
       end
 
-      subject { options.target }
+      subject { @opts.target }
+
+      context "when target not set" do
+        it { should eq "exe" }
+      end
 
       context "when target = :library", target: :library do
         it { should eq "library" }
@@ -101,100 +116,109 @@ describe 'fsharp' do
         it { should eq "exe" }
       end
     end
+  end
 
-    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
-        expect(options.source_files).to eq(sources)
+  describe "source files" do
+    it "contains the passed sources" do
+      sources = ["source1.fs", "source2.fs"]
+      FileUtils.touch "source1.fs"
+      FileUtils.touch "source2.fs"
+      @opts = invoke_fsc do |t|
+        t.source_files = sources
       end
+      expect(@opts.source_files).to eq(sources)
     end
+  end
 
-    describe "output" do
-      it "sets the output file" do
-        task = fsc "f/p.exe" do |t|
-          @setup.call(t) if @setup
-        end
-        task.invoke
-        expect(@opts.out).to eq("f/p.exe")
-      end
-    end
-
-    describe "build optimization" do
-      context "build output is older than source files" do
-        it "calls the compiler" do
-          FileUtils.touch('./p.exe')
-          FileUtils.touch('s.fs')
-          task = fsc "p.exe" do |t|
-            t.target = :exe
-            t.source_files = ["s.fs"]
-          end
-          task.invoke
-          expect(@opts).to_not be_nil
+  describe "output" do
+    it "sets the output file" do
+      @opts = invoke_fsc "f/p.exe" do |t|
+      end
+      expect(@opts.out).to eq("f/p.exe")
+    end
+  end
+
+  describe "build optimization" do
+    context "build output is older than source files" do
+      it "calls the compiler" do
+        FileUtils.touch('./p.exe')
+        FileUtils.touch('s.fs')
+        @opts = invoke_fsc "p.exe" do |t|
+          t.target = :exe
+          t.source_files = ["s.fs"]
         end
+        expect(@opts).to_not be_nil
       end
+    end
 
-      context "build output is newer than source files" do
-        it "does not call the compiler" do
-          FileUtils.touch('s.fs')
-          FileUtils.touch('./p.exe')
-          task = fsc "p.exe" do |t|
-            t.target = :exe
-            t.source_files = ["s.fs"]
-          end
-          task.invoke
-          expect(@opts).to be_nil
+    context "build output is newer than source files" do
+      it "does not call the compiler" do
+        FileUtils.touch('s.fs')
+        FileUtils.touch('./p.exe')
+        @opts = invoke_fsc "p.exe" do |t|
+          t.target = :exe
+          t.source_files = ["s.fs"]
         end
+        expect(@opts).to be_nil
+      end
+    end
+
+    it "does not copy the source file to the destination folder by default" do
+      FileUtils.mkdir('input', 'output')
+      FileUtils.touch('input/x.dll')
+      task = fsc "output/p.exe" do |t|
+        t.target = :exe
+        t.add_reference 'input/x.dll'
+      end
+      task.invoke
+      expect(File.file?('output/x.dll')).to be false
+    end
+
+    it "copies the source file to the destination folder" do
+      FileUtils.mkdir('input', 'output')
+      FileUtils.touch('input/x.dll')
+      task = fsc "output/p.exe" do |t|
+        t.target = :exe
+        t.add_reference 'input/x.dll', copy_local: true
       end
+      task.invoke
+      expect(File.file?('output/x.dll')).to be true
+    end
 
-      it "does not copy the source file to the destination folder by default" do
-          FileUtils.mkdir('input', 'output')
-          FileUtils.touch('input/x.dll')
-          task = fsc "output/p.exe" do |t|
-            t.target = :exe
-            t.add_reference 'input/x.dll'
-          end
-          task.invoke
-          expect(File.file?('output/x.dll')).to be false
-      end
-
-      it "copies the source file to the destination folder" do
-          FileUtils.mkdir('input', 'output')
-          FileUtils.touch('input/x.dll')
-          task = fsc "output/p.exe" do |t|
-            t.target = :exe
-            t.add_reference 'input/x.dll', copy_local: true
-          end
-          task.invoke
-          expect(File.file?('output/x.dll')).to be true
-      end
-
-      it "doesnt copy if copy_local is false" do
-          FileUtils.mkdir('output')
-          FileUtils.touch('output/x.dll')
-          task = fsc "output/p.exe" do |t|
-            t.target = :exe
-            t.add_reference 'input/x.dll', copy_local: false
-          end
-          task.invoke
-          op = lambda { task.invoke }
-          expect(op).to_not raise_error
+    it "doesnt copy if copy_local is false" do
+      FileUtils.mkdir('output')
+      FileUtils.touch('output/x.dll')
+      task = fsc "output/p.exe" do |t|
+        t.target = :exe
+        t.add_reference 'input/x.dll', copy_local: false
       end
+      task.invoke
+      op = lambda { task.invoke }
+      expect(op).to_not raise_error
     end
   end
+end
 
-  describe "target type" do
-    it "fails when using invalid target option" do
-      op = lambda do
-        task = fsc "p.exe" do |t|
-          t.target = :invalid_option
-        end
+describe "target type" do
+  it "fails when using invalid target option" do
+    op = lambda do
+      task = fsc "p.exe" do |t|
+        t.target = :invalid_option
       end
-      expect(op).to raise_error(/^Invalid target/)
     end
+    expect(op).to raise_error(/^Invalid target/)
+  end
+end
+
+def invoke_fsc *args, &block
+  opts = nil
+  expect_compiler_call do |o|
+    opts = o
+  end
+  args = ["dummy.exe"] if args == []
+  task = fsc *args do |t|
+    yield t if block_given?
   end
+  task.invoke
+  opts
 end

metadata

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