rscons 1.4.3 → 1.5.0

data/lib/rscons/varset.rb

@@ -1,9 +1,9 @@
 module Rscons
-  # This class represents a collection of variables which can be accessed
-  # as certain types.
-  # Only nil, strings, arrays, and hashes should be stored in a VarSet.
+  # This class represents a collection of variables which supports efficient
+  # deep cloning.
   class VarSet
     # Create a VarSet.
+    #
     # @param vars [Hash] Optional initial variables.
     def initialize(vars = {})
       @my_vars = {}
@@ -11,8 +11,10 @@ module Rscons
       append(vars)
     end
 
-    # Access the value of variable as a particular type
+    # Access the value of variable.
+    #
     # @param key [String, Symbol] The variable name.
+    #
     # @return [Object] The variable's value.
     def [](key)
       if @my_vars.include?(key)
@@ -29,15 +31,19 @@ module Rscons
     end
 
     # Assign a value to a variable.
+    #
     # @param key [String, Symbol] The variable name.
+    #
     # @param val [Object] The value to set.
     def []=(key, val)
       @my_vars[key] = val
     end
 
     # Check if the VarSet contains a variable.
+    #
     # @param key [String, Symbol] The variable name.
-    # @return [true, false] Whether the VarSet contains a variable.
+    #
+    # @return [Boolean] Whether the VarSet contains the variable.
     def include?(key)
       if @my_vars.include?(key)
         true
@@ -48,8 +54,11 @@ module Rscons
       end
     end
 
-    # Add or overwrite a set of variables
+    # Add or overwrite a set of variables.
+    #
     # @param values [VarSet, Hash] New set of variables.
+    #
+    # @return [self]
     def append(values)
       coa!
       if values.is_a?(VarSet)
@@ -62,7 +71,10 @@ module Rscons
     end
 
     # Create a new VarSet object based on the first merged with other.
+    #
     # @param other [VarSet, Hash] Other variables to add or overwrite.
+    #
+    # @return [VarSet] The newly created VarSet.
     def merge(other = {})
       coa!
       varset = self.class.new
@@ -71,9 +83,13 @@ module Rscons
     end
     alias_method :clone, :merge
 
-    # Replace "$" variable references in varref with the variables values,
-    # recursively.
+    # Replace "$\{var}" variable references in varref with the expanded
+    # variables' values, recursively.
+    #
     # @param varref [String, Array] Value containing references to variables.
+    #
+    # @return [String, Array]
+    #   Expanded value with "$\{var}" variable references replaced.
     def expand_varref(varref)
       if varref.is_a?(Array)
         varref.map do |ent|
@@ -99,6 +115,8 @@ module Rscons
     private
 
     # Move all VarSet variables into the copy-on-access list.
+    #
+    # @return [void]
     def coa!
       unless @my_vars.empty?
         @coa_vars.unshift(@my_vars)
@@ -107,8 +125,13 @@ module Rscons
     end
 
     # Create a deep copy of an object.
-    # @param obj [nil, String, Array, Hash] Object to deep copy.
-    # @return [nil, String, Array, Hash] Deep copied value.
+    #
+    # Only objects which are of type String, Array, or Hash are deep copied.
+    # Any other object just has its referenced copied.
+    #
+    # @param obj [Object] Object to deep copy.
+    #
+    # @return [Object] Deep copied value.
     def deep_dup(obj)
       obj_class = obj.class
       if obj_class == Hash

data/lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # gem version
-  VERSION = "1.4.3"
+  VERSION = "1.5.0"
 end

data/rscons.gemspec

@@ -1,30 +1,28 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rscons/version'
+require "rscons/version"
 
 Gem::Specification.new do |gem|
   gem.name          = "rscons"
   gem.version       = Rscons::VERSION
   gem.authors       = ["Josh Holtrop"]
   gem.email         = ["jholtrop@gmail.com"]
-  gem.description   = %q{Software construction library inspired by SCons and implemented in Ruby}
+  gem.description   = %q{Software construction library inspired by SCons and implemented in Ruby.}
   gem.summary       = %q{Software construction library inspired by SCons and implemented in Ruby}
   gem.homepage      = "https://github.com/holtrop/rscons"
-  gem.license       = 'MIT'
+  gem.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = Dir["{bin,assets,lib}/**/*", "*.gemspec", "LICENSE.txt"]
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "rspec-core"
-  gem.add_development_dependency "rspec-mocks"
-  gem.add_development_dependency "rspec-expectations"
+  gem.add_dependency "json", "~> 1.0"
+
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "json"
-  gem.add_development_dependency 'rdoc'
   gem.add_development_dependency "yard"
+  gem.add_development_dependency "redcarpet"
 end

metadata

@@ -1,60 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: rscons
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Josh Holtrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec-core
-  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: rspec-mocks
-  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: rspec-expectations
+  name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,27 +70,15 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
-  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: rdoc
+  name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,13 +86,15 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,39 +102,18 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Software construction library inspired by SCons and implemented in Ruby
+description: Software construction library inspired by SCons and implemented in Ruby.
 email:
 - jholtrop@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile.rb
-- build_tests/build_dir/src/one/one.c
-- build_tests/build_dir/src/two/two.c
-- build_tests/build_dir/src/two/two.h
-- build_tests/clone_env/src/program.c
-- build_tests/custom_builder/program.c
-- build_tests/d/main.d
-- build_tests/header/header.c
-- build_tests/header/header.h
-- build_tests/library/one.c
-- build_tests/library/three.c
-- build_tests/library/two.c
-- build_tests/simple/simple.c
-- build_tests/simple_cc/simple.cc
-- build_tests/two_sources/one.c
-- build_tests/two_sources/two.c
-- lib/rscons.rb
 - lib/rscons/builder.rb
 - lib/rscons/builders/cfile.rb
 - lib/rscons/builders/disassemble.rb
@@ -172,58 +121,44 @@ files:
 - lib/rscons/builders/object.rb
 - lib/rscons/builders/preprocess.rb
 - lib/rscons/builders/program.rb
+- lib/rscons/build_target.rb
 - lib/rscons/cache.rb
 - lib/rscons/environment.rb
 - lib/rscons/varset.rb
 - lib/rscons/version.rb
+- lib/rscons.rb
 - rscons.gemspec
-- spec/build_tests_spec.rb
-- spec/rscons/builders/cfile_spec.rb
-- spec/rscons/builders/disassemble_spec.rb
-- spec/rscons/builders/library_spec.rb
-- spec/rscons/builders/object_spec.rb
-- spec/rscons/builders/preprocess_spec.rb
-- spec/rscons/builders/program_spec.rb
-- spec/rscons/cache_spec.rb
-- spec/rscons/environment_spec.rb
-- spec/rscons/varset_spec.rb
-- spec/rscons_spec.rb
-- spec/spec_helper.rb
+- LICENSE.txt
 homepage: https://github.com/holtrop/rscons
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -456926221
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -456926221
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Software construction library inspired by SCons and implemented in Ruby
-test_files:
-- spec/build_tests_spec.rb
-- spec/rscons/builders/cfile_spec.rb
-- spec/rscons/builders/disassemble_spec.rb
-- spec/rscons/builders/library_spec.rb
-- spec/rscons/builders/object_spec.rb
-- spec/rscons/builders/preprocess_spec.rb
-- spec/rscons/builders/program_spec.rb
-- spec/rscons/cache_spec.rb
-- spec/rscons/environment_spec.rb
-- spec/rscons/varset_spec.rb
-- spec/rscons_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTNkMDYxN2I0NGJlMTJlOTQxYjYwMzA3MDI4ZGYxZTdjNzM3NjM4OA==
-  data.tar.gz: !binary |-
-    MTY0ZTBlY2QxMTQwNDE5ZTQ2OWJhYmEwZDZlZjAyYTYzZDliY2Q3MQ==
-SHA512:
-  metadata.gz: !binary |-
-    MjU3M2FlNzE3M2YyZmFmMjJlMThmYWQzNjVjM2M0MGU1MjM0ZTc0ZTU0YjZh
-    NjM1ODM2ZDBhYjhmYzdkZTM0MTNiMDNiNzU2Mzc2ODdiOWJiM2Q3NjZiNzBl
-    YzE4YmQ5ODdmM2RlNTg4YjNmOGJlMTc1YWQ5M2EyNTUxY2I4OGM=
-  data.tar.gz: !binary |-
-    MTI1MTgxZmQ5M2I3YTMxYzVmZTM5ZWUzNDRjMmFjMGZkNzZmMGRmMDlmMzA3
-    ODJlZGQ0YzNlNzIxOGUxNTdlNGY2NmQ0MzVlMmRkZmU5Y2U3MDE0NjQ0Mjg0
-    NzY3ZjA4ZjdmN2QzZWY4N2ZmY2RjYTQ2YWYwNzkzMzcxM2I2MzU=

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-build_test_run