destination 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c87ef0e4945f33c116ac74e001422db220c1aca
-  data.tar.gz: 8336a56d52f70ef36106a36a63bdc8ac1530568a
+  metadata.gz: 097b24f39873e393a93fa196eafaa61f65ca1d11
+  data.tar.gz: 311237b8696731bda8c796a5dac78850f0cd686e
 SHA512:
-  metadata.gz: 6b48cd003dcdd853ca26f1c658dfb88af252dffce21ec4a68ca7456d81bebc5f51152da73e85cbf7d8e005ca6254adda1851cd4d922228a2e6ee45155827c340
-  data.tar.gz: 0dfe14f2586733f1b48046c9bcfe5cb68e3bccab138a02c78381aba9c667d86210d900463d9ef0be77f9ffa5ca82775622fda7db50eb0d706a057038e9b32eb1
+  metadata.gz: c025dcd871e7f0927cfdf4d4159c947a4695ba5950ae8677aa52d6a556434565b478683325a20a161a80758186114bdf663825de0b402d7075c3f1060dc51fb3
+  data.tar.gz: 20f46d9dc5b690c67e7b1f08fe3e10bd3809766e9944dddc34515dcc8b57a0fc3bb738eccfdef2ee8f85089d66c0dc33621589064994d61f4724dd9bf2d66816

data/.gitignore

@@ -2,3 +2,6 @@
 
 *.gem
 **/*.bc
+
+# Binaries
+test/project/project

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    dest (0.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.5)
+  dest!
+  rake
+  rspec
+  rspec-expectations

data/lib/dest.rb

@@ -5,4 +5,7 @@ require 'dest/version'
 require 'dest/project/base'
 
 module Dest
+  module Util
+    XCODE_FRAMEWORKS = File.join(`xcode-select -p`.strip, 'Library', 'Frameworks')
+  end
 end

data/lib/dest/project/base.rb

@@ -6,12 +6,22 @@ module Dest
     end
 
     class Base
-      attr_accessor :dir, :frameworks, :sources, :target
+      attr_accessor :dir, :frameworks, :sources, :target, :compile_flags, :link_flags, :main
+      # Testing stuff
+      attr_accessor :test_frameworks, :test_target, :test_sources
+
       def initialize dir
         @dir = dir
         @frameworks = ['Foundation']
         @sources = []
         @target  = guess_target
+        @compile_flags = ''
+        @link_flags    = ''
+        @main = guess_main
+
+        @test_frameworks = []
+        @test_target = nil
+        @test_sources = []
       end
       # def scan_sources
       #   src  = Dir[File.join(@dir, 'src', '**/*.m')]
@@ -21,13 +31,28 @@ module Dest
       def add_source fn
         @sources << File.expand_path(fn)
       end
+      alias :add_source_file :add_source
       def add_source_directory dir
-        Dir[File.join dir, '**/*.m'].map {|fn| File.expand_path fn }.each {|fn| @sources << fn }
+        glob_sources(dir).each {|fn| @sources << fn }
+      end
+      def add_test_directory dir
+        glob_sources(dir).each {|fn| @test_sources << fn }
+      end
+
+      # Handy utility method to pull in special Xcode frameworks needed for
+      # testing and the like.
+      def include_xcode_frameworks!
+        @compile_flags << "-F #{Dest::Util::XCODE_FRAMEWORKS}"
+        @link_flags    << "-F #{Dest::Util::XCODE_FRAMEWORKS} -Wl,-rpath,#{Dest::Util::XCODE_FRAMEWORKS}"
       end
+
       def guess_target
         # Turns '/a/b/c' into just 'c'
         File.basename dir
       end
+      def guess_main
+        File.join(@dir, 'main.m')
+      end
 
       def self.setup dir=nil, &block
         unless dir
@@ -37,6 +62,12 @@ module Dest
         Dest::Project.current = proj
         block.call proj
       end
+
+      private
+      def glob_sources dir
+        Dir[File.join dir, '**/*.m'].map {|fn| File.expand_path fn }
+      end
+
     end
   end
 end

data/lib/dest/rake.rb

@@ -25,6 +25,9 @@ module Dest
       flags << '-Wall' # All warnings
       flags << '-emit-llvm'
       flags << '-fobjc-arc'
+      if project.compile_flags
+        flags << project.compile_flags
+      end
       @flags = flags.join ' '
     end
 
@@ -33,13 +36,18 @@ module Dest
       dir = File.dirname object
       FileUtils.mkdir_p dir
       # Then build
-      system "clang #{source} #{flags} -o #{object}"
+      sh "clang #{source} #{flags} -o #{object}"
+    end
+
+    def time_action name
+      start = Time.now
+      yield
+      diff = ((Time.now - start) * 1000).round
+      puts name + " (#{diff.to_s} ms)".light_black
     end
 
     # Set up rake hooks
     def setup
-      # puts project.sources.inspect
-      # puts project.target
       @build_dir = File.join project.dir, 'build'
       unless Dir.exists? @build_dir
         Dir.mkdir @build_dir
@@ -52,52 +60,94 @@ module Dest
         puts "Built #{File.basename project.target}".green
       end
 
-      # Build the sources into their objects via the rule below
-      file project.target => project.sources.map {|fn| objectsify fn } do |t|
-        # Then build the target file from the sources
-        target  = t.name
-        objects = t.prerequisites
-        # Little message
-        time_action "Linking #{File.basename target} from #{objects.length.to_s} objects" do
-          # Then figure out our frameworks and objects
-          objects = objects.join ' '
-          frameworks = project.frameworks.map {|f| "-framework #{f}" }.join ' '
-          system "clang #{objects} -lobjc #{frameworks} -o #{target}"
-        end
+      self.setup_target
+      self.setup_source_files
+
+      if project.test_target
+        self.setup_test_target
+        self.setup_test_files
       end
 
-      def time_action name
-        start = Time.now
-        yield
-        diff = ((Time.now - start) * 1000).round
-        puts name + " (#{diff.to_s} ms)".light_black
+      desc 'Clean up build artifacts and target'
+      task 'clean' do
+        sh "rm -f #{project.target}"
+        project.sources.each do |fn|
+          fn = objectsify fn
+          sh "rm -f #{fn}"
+        end
+      end
+      
+      namespace 'test' do
+        desc 'Build the test target'
+        task 'build' => project.test_target do
+          puts "Built #{File.basename project.test_target}".green
+        end
+        desc 'Clean test build artifacts'
+        task 'clean' do
+          sh "rm -f #{project.test_target}"
+          project.test_sources.each do |fn|
+            fn = objectsify fn
+            sh "rm -f #{fn}"
+          end
+        end
       end
+      
+    end#setup
+
+    # Build the target file from the sources
+    def setup_target
+      link_target_task project.target, (project.sources + [project.main]).map {|fn| objectsify fn }
+    end
 
-      # Set up a file task for every source file to catch changes
+    # Set up a file task for every source file
+    def setup_source_files
       project.sources.each do |src|
         # Figure out where stuff should come from and go to
         source_file = src
         object_file = objectsify src
-
-        file object_file => source_file do |t|
-          # Try to strip off the leading directory
-          fn = src.sub project.dir+'/', ''
-          time_action "Compiling #{fn}" do
-            compile source_file, object_file
-          end
-        end
+        compile_task object_file, source_file
       end#project.sources.each
+    end#setup_source_files
+    
+    # Set up test source files and test target tasks
+    def setup_test_files
+      project.test_sources.each do |src|
+        compile_task objectsify(src), src
+      end
+    end
+    def setup_test_target
+      link_target_task project.test_target,
+                       (project.sources + project.test_sources).map {|fn| objectsify fn },
+                       :frameworks => project.test_frameworks
+    end
 
-      desc 'Clean up build artifacts and target'
-      task 'clean' do
-        system "rm -f #{project.target}"
-        project.sources.each do |fn|
-          fn = objectsify fn
-          system "rm -f #{fn}"
+    private
+    def compile_task object, source
+      file object => source do |t|
+        # Try to strip off the leading directory
+        fn = source.sub project.dir+'/', ''
+        time_action "Compiling #{fn}" do
+          compile source, object
         end
       end
-
-    end#setup
+    end
+    def link_target_task target, objects, opts = {}
+      file target => objects do |t|
+        # Little message
+        time_action "Linking #{File.basename target} from #{objects.length.to_s} objects" do
+          # Then figure out our frameworks and objects
+          objects = objects.join ' '
+          frameworks = project.frameworks
+          if opts[:frameworks]
+            opts[:frameworks].each {|f| frameworks << f }
+          end
+          # Concatenate all the frameworks together
+          frameworks = frameworks.map {|f| "-framework #{f}" }.join ' '
+          flags = project.link_flags || ''
+          sh "clang #{objects} -lobjc #{frameworks} #{flags} -o #{target}"
+        end
+      end
+    end#link_target_task
 
   end#Rake
 end#Dest

data/lib/dest/version.rb

@@ -1,3 +1,3 @@
 module Dest
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: destination
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Dirk Gadsden
@@ -102,6 +102,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - dest.gemspec