destination 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51cf1d14a0c68b2167284b5cb4be5d8ae66d6a9b
-  data.tar.gz: c44b499d6d4181c7957b32e5e75e3209f2c22120
+  metadata.gz: 9172790a783af746bd3b9860a06d304fd9252065
+  data.tar.gz: 174dbf1b3d5a570745e8f4e91b6beb611dd509a6
 SHA512:
-  metadata.gz: 7331348cf976737cc1b7bcd4c6d360e3122b5d4b232ecad73057afb919e0b373b8ef03bf8b5a434d2754bbcd96a2a06e3da6d12e17dbba00434eee8e0321da2d
-  data.tar.gz: 4b97cee34f568fc21302a09116f7d18f987ca34b7237e4325f2d10d0d149a04947cb5464cae940929442a9ff244e2495cf8f1d57836a8b5a2841321ce6be3357
+  metadata.gz: 18f7315f37c901dd4b12b4862570f9a4c20bb4708b5f405842a633e1234025a4b5aee8df94be173215e760871c11d1c641f80da2d1fccf3bb4d99dd680dafb73
+  data.tar.gz: f2dd718c9e7e7de7f52bb3372002c9302bc62e9dd279382984ac26f033992ec1d9acd2073aac521a805199c0741a54c1e0c354cf40665aef27867d138dd56ff2

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+
+*.gem
+**/*.bc

data/README.md

@@ -6,9 +6,9 @@ Thing is, though, Obj-C and Clang *don't actually need Xcode*. Destination (shor
 
 ### Getting started
 
-```
+```bash
 # Clone the repo
-...
+git clone https://github.com/dirk/dest.git
 # Go into the test project directory
 cd test/project
 # Invoke destination

data/dest.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rake", '~> 3.0', '>= 3.0.0'
+  spec.add_dependency 'colorize', '~> 0.7'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rspec", '~> 3.0', '>= 3.0.0'

data/lib/dest.rb

@@ -1,4 +1,6 @@
 
+require 'colorize'
+
 require 'dest/version'
 require 'dest/project/base'
 

data/lib/dest/project/base.rb

@@ -6,18 +6,23 @@ module Dest
     end
 
     class Base
-      attr_reader   :dir
-      attr_accessor :frameworks, :sources, :target
+      attr_accessor :dir, :frameworks, :sources, :target
       def initialize dir
         @dir = dir
         @frameworks = ['Foundation']
-        @sources = scan_sources
-        @target = guess_target
+        @sources = []
+        @target  = guess_target
       end
-      def scan_sources
-        src  = Dir[File.join(@dir, 'src', '*.m')]
-        root = Dir[File.join(@dir, '*.m')]
-        return src + root
+      # def scan_sources
+      #   src  = Dir[File.join(@dir, 'src', '**/*.m')]
+      #   root = Dir[File.join(@dir, '*.m')]
+      #   return src + root
+      # end
+      def add_source fn
+        @sources << File.expand_path(fn)
+      end
+      def add_source_directory dir
+        Dir[File.join dir, '**/*.m'].map {|fn| File.expand_path fn }.each {|fn| @sources << fn }
       end
       def guess_target
         # Turns '/a/b/c' into just 'c'

data/lib/dest/rake.rb

@@ -29,7 +29,11 @@ module Dest
     end
 
     def compile source, object
-      sh "clang #{source} #{flags} -o #{object}"
+      # Ensure we have the directory
+      dir = File.dirname object
+      FileUtils.mkdir_p dir
+      # Then build
+      system "clang #{source} #{flags} -o #{object}"
     end
 
     # Set up rake hooks
@@ -41,9 +45,11 @@ module Dest
         Dir.mkdir @build_dir
       end
 
+      task 'default' => 'build'
+
       desc 'Build the project'
       task 'build' => project.target do
-        puts "Built #{File.basename project.target}"
+        puts "Built #{File.basename project.target}".green
       end
 
       # Build the sources into their objects via the rule below
@@ -52,11 +58,19 @@ module Dest
         target  = t.name
         objects = t.prerequisites
         # Little message
-        puts "Linking #{File.basename target} from #{objects.length.to_s} objects"
-        # Then figure out our frameworks and objects
-        objects = objects.join ' '
-        frameworks = project.frameworks.map {|f| "-framework #{f}" }.join ' '
-        sh "clang #{objects} -lobjc #{frameworks} -o #{target}"
+        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
+      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 a file task for every source file to catch changes
@@ -66,13 +80,24 @@ module Dest
         object_file = objectsify src
 
         file object_file => source_file do |t|
-          basename = File.basename src
-          puts "Compiling #{basename}"
+          # Try to strip off the leading directory
+          fn = src.sub project.dir+'/', ''
+          time_action "Compiling #{fn}" do
+            compile source_file, object_file
+          end
+        end
+      end#project.sources.each
 
-          compile source_file, object_file
+      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}"
         end
       end
 
-    end#self.setup
+    end#setup
+
   end#Rake
 end#Dest

data/lib/dest/version.rb

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

data/test/project/Rakefile

@@ -6,5 +6,7 @@ require 'dest/rake'
 
 Dest::Project::Base.setup do |proj|
   proj.frameworks << 'Cocoa'
+  proj.add_source 'main.m'
+  proj.add_source_directory 'Example'
 end
 Dest::Rake.setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: destination
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dirk Gadsden
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - Gemfile
 - LICENSE