rakeoe 0.0.11 → 0.0.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bde033f380668404227a6a3456689d7f1ad286b7
+  data.tar.gz: a4d146592a4efb66346ec1caaa30962356046b7d
+SHA512:
+  metadata.gz: 0e4bdf9aab180aac347e05c74398cb2f10f0f6d358f6b5721fe9ce79c8565a2bf71bada7cd49392a148db2c1e6d7d8a813d82d755963eafaa9932c2073c2fb64
+  data.tar.gz: be85b351a5533e9d9edbd08169726cb755bc5ee500e610b11d90aec7221ccb74501589849033ae3ebeb1a80a1328a713799950c2620cfa15b45d7198a5bb45ac

data/lib/rakeoe/key_value_reader.rb

@@ -29,18 +29,11 @@ class KeyValueReader
   # Substitute all dollar values with either already parsed
   # values or with system environment variables
   def self.substitute_dollar_symbols!(env)
+    env.merge!(ENV)
     resolved_dollar_vars = env.each_with_object(Hash.new) do |var, obj|
-      # search for '$BLA..' identifier
-      pattern = /\$[[:alnum:]]+/
-      match = var[1].match(pattern)
-      if match
-        # remove '$' from match, we don't need it as key
-        key = match[0].gsub('$', '')
-        value = env[key] ? env[key] : ENV[key]
-        raise "No $#{key} found in environment" if value.nil?
-
-        obj[var[0]] = var[1].gsub(pattern, value)
-      end
+      # expand all variables
+      pattern = /\$([a-zA-Z_]+[a-zA-Z0-9_]*)|\$\{(.+)\}/
+      obj[var[0]] = var[1].gsub(pattern) { env[$1||$2] }
     end
     # overwrite old values with resolved values
     env.merge!(resolved_dollar_vars)

data/lib/rakeoe/prj_file_cache.rb

@@ -45,7 +45,7 @@ module RakeOE
       all_prj_files = FileList[globs]
       raise "No projects inside #{dirs}?!" if all_prj_files.empty?
 
-      all_prj_files.each do |file|
+      all_prj_files.uniq.each do |file|
         # extract last path from prj.rake as project name
         dir = File.dirname(file)
         name = File.basename(dir)

data/lib/rakeoe/version.rb

@@ -1,3 +1,3 @@
 module RakeOE
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/lib/rakeoe.rb

@@ -18,7 +18,7 @@ module RakeOE
   include Rake::DSL   # for #task, #desc, #namespace
 
   # Initialize RakeOE project. Reads & parses all prj.rake files
-  # of given config.
+  # of given config. Provides all rake tasks.
   #
   # @param config [RakeOE::Config]      Configuration as provided by project Rakefile
   #
@@ -26,7 +26,13 @@ module RakeOE
   def init(config)
 
     RakeOE::PrjFileCache.set_defaults(RakeOE::Default.prj_settings)
-    RakeOE::PrjFileCache.sweep_recursive(config.directories[:apps] + config.directories[:libs])
+
+    src_dirs = []
+    src_dirs += config.directories[:src] if config.directories[:src]
+    src_dirs += config.directories[:apps] if config.directories[:apps]
+    src_dirs += config.directories[:libs] if config.directories[:libs]
+
+    RakeOE::PrjFileCache.sweep_recursive(src_dirs.uniq)
 
     toolchain = RakeOE::Toolchain.new(config)
     RakeOE::PrjFileCache.join_regex_keys_for!(toolchain.target)

data/rakeoe.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler',      '~> 1.3'
   spec.add_development_dependency 'rspec',        '~> 3'
-  spec.add_development_dependency 'factory_girl', '~> 4.0'
 
   spec.required_ruby_version = '>= 1.9.2'
 

data/spec/rakoe_spec.rb

@@ -1,19 +1,5 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
-describe RakeOE do
-  it 'does stuff' do
-    #
-  end
-end
-
-describe PrjFileCache do
-  it 'does read prj.rake files' do
-    prj_cache = FactoryGirl.build(:prj_file_cache)
-    # factory girl does not provide any class variable support => bummer!
-    #expect(prj_cache.class.get('APP', 'hello', 'PRJ_HOME')).to equal('.')
-  end
-
-end
 
 describe RakeOE::Config do
   before(:all) do
@@ -25,4 +11,10 @@ describe RakeOE::Config do
   end
 
 
+end
+
+describe 'Projects' do
+  it 'should build a minimal project' do
+    sh 'cd projects/minimal_prj && TOOLCHAIN_ENV=platform/platform_osx rake -T'
+  end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,4 @@ require 'bundler/setup'
 Bundler.setup
 
 require 'rakeoe'
-require 'factory_girl'
-
-FactoryGirl.find_definitions
 

metadata

@@ -1,81 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: rakeoe
 version: !ruby/object:Gem::Version
-  version: 0.0.11
-  prerelease: 
+  version: 0.0.12
 platform: ruby
 authors:
 - Daniel Schnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
-description: ! "Rake Optimized for Embedded: RakeOE is a build system for application/library
+description: "Rake Optimized for Embedded: RakeOE is a build system for application/library
   development.\n                          RakeOE utilizes the power of Rake and the
   easyness of Ruby to make build management for\n                          embedded
   C/C++ development as easy and straight-forward as possible.\n                          It's
@@ -87,7 +64,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -110,11 +87,8 @@ files:
 - lib/rakeoe/toolchain/environment-arm-stm32f072-eabi.osx
 - lib/rakeoe/version.rb
 - rakeoe.gemspec
-- spec/factories.rb
 - spec/rakoe_spec.rb
 - spec/spec_helper.rb
-- spec/support/factories_spec.rb
-- spec/support/factory_girl.rb
 - templates/platform/environment-arm-stm32f0-eabi
 - templates/platform/environment-setup-armv7a-vfp-neon-linux-gnueabi
 - templates/platform/environment-x86-linux-gnu.suse.11
@@ -122,32 +96,28 @@ files:
 homepage: http://rakeoe.github.io/rakeoe/
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
-summary: ! 'Rake Optimized for Embedded: build system for test driven Embedded C/C++
+specification_version: 4
+summary: 'Rake Optimized for Embedded: build system for test driven Embedded C/C++
   Development based on Ruby Rake.'
 test_files:
-- spec/factories.rb
 - spec/rakoe_spec.rb
 - spec/spec_helper.rb
-- spec/support/factories_spec.rb
-- spec/support/factory_girl.rb

data/spec/factories.rb

@@ -1,5 +0,0 @@
-FactoryGirl.define do
-  factory :prj_file_cache, class: PrjFileCache do
-    prj_list {  { 'APP' => { 'hello' => {'PRJ_HOME' => '.', 'PRJ_FILE' => './prj.rake'}}} }
-  end
-end

data/spec/support/factories_spec.rb

@@ -1,34 +0,0 @@
-# /spec/support/factories_spec.rb
-
-# If using RSpec 2.x (or if not using Rails), require `spec_helper` instead
-require 'spec_helper'
-
-# If using RSpec 2.x, remove `RSpec.`
-RSpec.describe "Factory Girl" do
-  FactoryGirl.factories.map(&:name).each do |factory_name|
-    describe "#{factory_name} factory" do
-
-      # Test each factory
-      it "is valid" do
-        factory = FactoryGirl.build(factory_name)
-        if factory.respond_to?(:valid?)
-          # the lamba syntax only works with rspec 2.14 or newer;  for earlier versions, you have to call #valid? before calling the matcher, otherwise the errors will be empty
-          expect(factory).to be_valid, lambda { factory.errors.full_messages.join("\n") }
-        end
-      end
-
-      # Test each trait
-      FactoryGirl.factories[factory_name].definition.defined_traits.map(&:name).each do |trait_name|
-        context "with trait #{trait_name}" do
-          it "is valid" do
-            factory = FactoryGirl.build(factory_name, trait_name)
-            if factory.respond_to?(:valid?)
-              expect(factory).to be_valid, lambda { factory.errors.full_messages.join("\n") }
-            end
-          end
-        end
-      end
-
-    end
-  end
-end

data/spec/support/factory_girl.rb

@@ -1,5 +0,0 @@
-# RSpec
-# spec/support/factory_girl.rb
-RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-end