skipjack 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45212391c78ee847aa3758aa06f9d078b42f3140
-  data.tar.gz: ffc8357f6c1a97aae7759fcd8b5ad58c414837a1
+  metadata.gz: 3cb9abf2582ba7c6272ee0a2e7e4e68fa1adfb66
+  data.tar.gz: 7d2a1174d871fdd42b32eaf8919f3b920686e118
 SHA512:
-  metadata.gz: 07948252ead2a70c6cfdbe867979bd5086cb45b7d45e4d04680fce514734b022c7c4375e9675e3a926f58382eb743a433ed9cfdd4edb3a8f18ac66f9a3bc63ce
-  data.tar.gz: 460953a17949cf4ed9796ece4c4fbcaef058ac2e83d859d6089f7c0a4d35e47dd705a48db364ec0e57c59c8546ec2a97f7bf707d9ff0668ab153c8e3ee36f2a7
+  metadata.gz: 4ab0948f509da6eb6e54266e31292e9855ed0d51ae98eb2a1864ceb063dd2d1b36b32fffdbe88c268b4d3b498362c275011734881567e5573f67fcbadede3eeb
+  data.tar.gz: 42a53aa73621cbe99a18135430411030106907f61a311bdc6bee7de3ff4c9807c69940c204b5975a75b88c4c9ab8b95fd0067ad3fe0a3d904f801add96e33987

data/.travis.yml

@@ -1,5 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.1.5
-
+  - 2.3.1

data/Guardfile

@@ -1,6 +1,6 @@
 guard :rspec, cmd: "bundle exec rspec" do
   require "guard/rspec/dsl"
-  watch(%r{^spec/.+_spec\.rb$})
+  #watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
   watch(%r{^spec/.*\.rb})       { "spec" }

data/lib/skipjack/fsharp.rb

@@ -1,10 +1,12 @@
 module Skipjack
   class FSharpCompiler
     attr_reader :target
-    attr_writer :references
+    attr_writer :references, :local_refs
+    attr_accessor :resident
 
     def initialize *args
       @args = *args
+      self.resident = true #default value
       yield self if block_given?
     end
 
@@ -25,6 +27,15 @@ module Skipjack
       @references ||= []
     end
 
+    def local_refs
+      @local_refs ||= []
+    end
+
+    def add_reference(ref, copy_local: false)
+      references << ref
+      local_refs << ref if copy_local
+    end
+
     def create_file_task *args
       dependencies = source_files
       file_task = Rake::FileTask::define_task *args do |t|
@@ -34,18 +45,36 @@ module Skipjack
           compiler = "fsharpc"
         end
 
-        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}"
+        opts = []
+        opts << "--out:#{t.name}"
+        opts << "--target:#{target.to_s}"
+        references.each { |r| opts << "--reference:#{r}" }
+        if resident
+          opts << "--resident"
+        end
+
+        dir = File.dirname(t.name)
+
+        cmd = "#{compiler} #{opts.join(" ")} #{source_files.join(" ")}"
         raise "Error executing command" unless Kernel.system cmd
       end
       file_task.enhance dependencies
     end
 
+    def add_reference_dependencies(task)
+      local_refs.each do |r|
+        dest = File.join(File.dirname(task.name), File.basename(r))
+        reference_task = Rake::FileTask::define_task dest => [r] do |t|
+          FileUtils.cp(t.prerequisites[0], t.name)
+        end
+        task.enhance [reference_task] unless dest == r
+      end
+    end
+
     def create_task
-      create_file_task *@args
+      task = create_file_task *@args
+      add_reference_dependencies(task)
+      task
     end
   end
 end

data/lib/skipjack/version.rb

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

data/skipjack.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "fakefs"

data/spec/helpers.rb

@@ -28,6 +28,7 @@ module Helpers
 
   class CompilerOptions
     attr_accessor :executable, :target, :out
+    attr_accessor :resident
     attr_writer :source_files
     attr_writer :references
 
@@ -50,6 +51,7 @@ module Helpers
     args.shift
 
     CompilerOptions.new do |c|
+      c.resident = false
       c.executable = executable
       /--target:(\w*)/.match(cmd) do |m|
         c.target = m[1]
@@ -59,6 +61,10 @@ module Helpers
         c.out = m[1]
       end
 
+      %r{--resident}.match(cmd) do
+        c.resident = true
+      end
+
       cmd.scan(/--reference:([^ ]*)/) do |m|
         c.references << m[0]
       end

data/spec/lib/skipjack/fsharp_spec.rb

@@ -60,6 +60,30 @@ describe 'fsharp' do
       it { should eq ["ref1.dll", "ref2.dll"] }
     end
 
+    describe "--resident" do
+      before do |ex|
+        @setup = lambda do |t|
+          t.resident = ex.metadata[:resident] unless ex.metadata[:resident].nil?
+        end
+      end
+
+      subject { options.resident }
+
+      context "resident is not set" do
+        it "defaults to true" do
+          expect(subject).to eq true
+        end
+      end
+
+      context "resident set to true", resident: true do
+        it { should eq true }
+      end
+
+      context "resident set to false", resident: false do
+        it { should eq false }
+      end
+    end
+
     describe "--target: argument" do
       before do |ex|
         @setup = lambda do |t|
@@ -102,7 +126,7 @@ describe 'fsharp' do
 
     describe "build optimization" do
       context "build output is older than source files" do
-        it "calls the compiler", :focus => true do
+        it "calls the compiler" do
           FileUtils.touch('./p.exe')
           FileUtils.touch('s.fs')
           task = fsc "p.exe" do |t|
@@ -113,8 +137,9 @@ describe 'fsharp' do
           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
+        it "does not call the compiler" do
           FileUtils.touch('s.fs')
           FileUtils.touch('./p.exe')
           task = fsc "p.exe" do |t|
@@ -125,6 +150,40 @@ describe 'fsharp' do
           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 "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
 

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+# require 'pp' early, because it gets implicitly required later, and it
+# messes with FakeFS if FakeFS is not required last.
+require 'pp'
 require 'skipjack'
 require 'rake'
 require_relative 'helpers'

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: skipjack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Peter Strøiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   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: guard-rspec
   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: 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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A collection of Rake commands for compiling .NET code wihtout dependency
@@ -102,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Guardfile
@@ -129,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build .NET code with Rake