gaudi 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9572100013a2fd71a8731d6a867551d32870517
-  data.tar.gz: 76f8b77cd00878adeb57286b25473c8a8ae8abd7
+  metadata.gz: 93ca793760bc2eba8c9d779334f5169df4612d12
+  data.tar.gz: ebd25f3ff9f45fa48b03092a6210565c20f0f21e
 SHA512:
-  metadata.gz: 883e81256e3fad544f558c17ce629f26aa5dbfa745883101a6a3065c067cc08e09014359604df846ae0775b24e53eb9a1ab8c6bb079fa6f67ec01c406d8c79c0
-  data.tar.gz: bed2868f0897ef1efa8716501a01e90e24eaa181e9e408fbf28dc37e9af6fc19c565daf57e484a7ffce911dc4c1d0a75e466da5b4276317ee3ebd6a4bbd67283
+  metadata.gz: 8e244dedee175f9e3f5ffefd47d68b364886a3b63f1c0f528dcab0ecabd9bf6cfb1ec03c5f9ba940cf891f52082761d0d97827af847771e6c6702d8f168104ef
+  data.tar.gz: 0c96b914d94518a01b6304ea197f5fb9d5092f64f908058a1aeca73ea2470ef821dfeb97bc3cf8b2721a8cc9527c87c09b345c5c166e48f64a32701cd6a5b817

data/History.txt

@@ -1,3 +1,9 @@
+#0.3.0
+* Added *deployments* and *common* subdirectories when scaffolding src
+* Added an empty library configuration file and the platform config reference
+* Added the *auto_rules* option in the system configuration
+* Pull Gaudi "libraries" with -l
+
 #0.2.4
 * Fix bug when project root contains spaces
 * DRYed the code
@@ -8,10 +14,10 @@
 #0.2.2
 * Added update functionality
 #0.2.0
-* Pulls HEAD of gaudi from GitHub in the scaffold 
+* Pulls HEAD of gaudi from GitHub in the scaffold
 
 #0.1.0
 * Scaffolding code for new projects
 ** Directory structure
-** Example system configuration 
+** Example system configuration
 ** Example platform configuration

data/lib/gaudi/scaffolding.rb

@@ -6,7 +6,7 @@ require 'rubygems'
 require 'archive/tar/minitar'
 
 module Gaudi
-  class Error <RuntimeError
+  class GemError <RuntimeError
   end
   class Gem
     MAIN_CONFIG="system.cfg"
@@ -21,6 +21,7 @@ module Gaudi
       options.verbose= false
       options.scaffold= false
       options.update= false
+      options.library= false
       options.version= "HEAD"
 
       opt_parser = OptionParser.new do |opts|
@@ -39,6 +40,19 @@ module Gaudi
           options.update=true
           options.scaffold=false
         end
+        opts.on("-l", "--lib NAME URL PROJECT_PATH","Pull/Update Gaudi library from URL on project at PROJECT_PATH") do |name|
+          options.library=true
+          options.update=false
+          options.scaffold=false
+          options.lib=name
+          if ARGV.size<2
+            raise GemError, "Missing parameters!"
+          end
+          url=ARGV.shift
+          proot=ARGV.shift
+          options.url=url
+          options.project_root=File.expand_path(proot)
+        end
         opts.separator ""
         opts.separator "Common options:"
         # Boolean switch.
@@ -54,7 +68,12 @@ module Gaudi
           exit
         end
       end
-      opt_parser.parse!(arguments)
+      begin
+        opt_parser.parse!(arguments)
+      rescue GemError
+        puts $!.message
+        exit 1
+      end
       return options
     end
     #:nodoc:
@@ -65,8 +84,10 @@ module Gaudi
           Gaudi::Gem.new(opts.project_root).project(opts.version)
         elsif opts.update
           Gaudi::Gem.new(opts.project_root).update(opts.version)
+        elsif opts.library
+          Gaudi::Gem.new(opts.project_root).library(opts.lib,opts.url,opts.version)
         end
-      rescue Gaudi::Error
+      rescue Gaudi::GemError
         puts $!.message
         exit 1
       end
@@ -78,35 +99,45 @@ module Gaudi
     end
     
     def project version
-      raise Error, "#{project_root} already exists!" if File.exists?(project_root) && project_root != Dir.pwd
+      raise GemError, "#{project_root} already exists!" if File.exists?(project_root) && project_root != Dir.pwd
       check_for_git
       directory_structure
       rakefile
       main_config
       platform_config
-      core(version,"lib")
+      lib_config
+      core("gaudi",REPO,version,"lib")
     end
 
     def update version
-      raise Error, "#{gaudi_home} is missing! Try creating a new Gaudi project first." unless File.exists?(gaudi_home)
+      raise GemError, "#{gaudi_home} is missing! Try creating a new Gaudi project first." unless File.exists?(gaudi_home)
       check_for_git
       puts "Removing old gaudi installation"
       FileUtils.rm_rf(File.join(gaudi_home,"lib/gaudi"))
-      core(version,"lib/gaudi lib/gaudi.rb")
+      core(version,REPO,"lib/gaudi lib/gaudi.rb")
     end
-    #:nodoc:
+
+    def library lib,source_url,version
+      raise GemError, "#{gaudi_home} is missing! Try creating a new Gaudi project first." unless File.exists?(gaudi_home)
+      #check_for_git
+      puts "Removing old #{lib} installation"
+      FileUtils.rm_rf(File.join(gaudi_home,"lib/#{lib}"))
+      puts "Pulling #{version} from #{source_url}"
+      core(lib,source_url,version,"lib/#{lib}")
+    end
+    #:stopdoc:
     def check_for_git
-      raise Error, "Could not find git. Make sure it is in the PATH" unless system("git --version")
+      raise GemError, "Could not find git. Make sure it is in the PATH" unless system("git --version")
     end
-    #:nodoc:
+    
     def directory_structure
       puts "Creating Gaudi filesystem structure at #{project_root}"
-      structure=["doc","lib","src","test","tools/build","tools/templates"]
+      structure=["doc","lib","src/deployments","src/common","test","tools/build","tools/templates"]
       structure.each do |dir|
         FileUtils.mkdir_p File.join(project_root,dir),:verbose=>false
       end
     end
-    #:nodoc:
+    
     def rakefile
       puts "Generating main Rakefile"
       rakefile=File.join(project_root,"Rakefile")
@@ -121,7 +152,7 @@ require_relative 'tools/build/lib/gaudi/tasks'
         File.open(rakefile, 'wb') {|f| f.write(rakefile_content) }
       end
     end
-    #:nodoc:
+    
     def main_config
       puts "Generating initial configuration file"
       config_file=File.join(project_root,"tools/build/#{MAIN_CONFIG}")
@@ -132,7 +163,7 @@ require_relative 'tools/build/lib/gaudi/tasks'
         File.open(config_file, 'wb') {|f| f.write(configuration_content) }
       end
     end
-    #:nodoc:
+    
     def platform_config
       puts "Generating example platform configuration file"
       config_file=File.join(project_root,"tools/build/#{PLATFORM_CONFIG}")
@@ -143,23 +174,34 @@ require_relative 'tools/build/lib/gaudi/tasks'
         File.open(config_file, 'wb') {|f| f.write(configuration_content) }
       end
     end
-    #:nodoc:
-    def core(version,lib_items)
+    
+    def lib_config
+      puts "Generating example library configuration file"
+      config_file=File.join(project_root,"tools/build/libs.yaml")
+      if File.exists?(config_file)
+        puts "libs.yaml exists, skipping generation"
+      else
+        configuration_content="---\n"
+        File.open(config_file, 'wb') {|f| f.write(configuration_content) }
+      end
+    end
+
+    def core(lib,url,version,lib_items)
       Dir.mktmpdir do |tmp|
-        if pull_from_repo(tmp)
+        if pull_from_repo(url,tmp)
           pkg=archive(version,File.join(tmp,"gaudi"),project_root,lib_items)
           unpack(pkg,gaudi_home)
         else
-          raise Error, "Cloning the Gaudi repo failed. Check that git is on the PATH and that #{REPO} is accessible"
+          raise GemError, "Cloning the Gaudi repo failed. Check that git is on the PATH and that #{REPO} is accessible"
         end
       end
     end
-    #:nodoc:
-    def pull_from_repo tmp
+
+    def pull_from_repo repository,tmp
       FileUtils.rm_rf('gaudi') if File.exists?('gaudi')
-      system "git clone #{REPO} \"#{tmp}/gaudi\""
+      system "git clone #{repository} \"#{tmp}/gaudi\""
     end
-    #:nodoc:
+    
     def archive version,clone_path,prj_root,lib_items
       pkg=File.expand_path(File.join(prj_root,"gaudipkg.tar"))
       Dir.chdir(clone_path) do |d|
@@ -169,7 +211,7 @@ require_relative 'tools/build/lib/gaudi/tasks'
       end
       return pkg
     end
-    #:nodoc:
+    
     def unpack pkg,home
       puts "Unpacking in #{home}"
       Dir.chdir(home) do |d|
@@ -178,5 +220,6 @@ require_relative 'tools/build/lib/gaudi/tasks'
       FileUtils.rm_rf(pkg)
       FileUtils.rm_rf(File.join(home,'pax_global_header'))
     end
+    #:startdoc:
   end
 end

data/lib/gaudi/templates/main.cfg.template

@@ -9,4 +9,7 @@ sources=../../src/
 #enumerate the platforms i.e. platforms=gcc,ms,arm
 #platforms= foo
 #add a platform=platform.cfg for each platform pointing to the platform configuration
-#foo=./foo.cfg
+#foo=./foo.cfg
+#Instead of specifying build rules manually, uncomment this line
+#and gaudi will create rake rules for objects and executables for each target platform
+#auto_rules=true

data/lib/gaudi/templates/platform.cfg.template

@@ -37,4 +37,6 @@ linker_in=
 linker_out=
 #Flag for linked libraries (shared or dynamic)
 linker_lib= 
-linker_commandfile_prefix= 
+linker_commandfile_prefix= 
+#The library configuration file
+lib_cfg=libs.yaml

data/lib/gaudi/version.rb

@@ -5,9 +5,9 @@ module Gaudi
       #Major version
       MAJOR=0
       #Minor version
-      MINOR=2
+      MINOR=3
       #Tiny version
-      TINY=4
+      TINY=0
       #All-in-one
       STRING=[MAJOR,MINOR,TINY].join('.')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gaudi
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Vassilis Rizopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Scaffolding and version management for Gaudi