gaudi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34daec01db5e9ca3ddb7356bb0662ca114e8b09
-  data.tar.gz: 646e9451ec10386e9bbdd946e23c4df31df397f7
+  metadata.gz: 49b03e10f805d01363da641da4b6fe21fd0e85c6
+  data.tar.gz: 5dd316ba79d9f5341e9527d0549d2c0f7b2ba791
 SHA512:
-  metadata.gz: b747ab81dccb758db968c81ff6e34633eab16d9af0c40beead51c2c0b8d74876fe9492b345b0a6de799841020d27ad0a98a7e39e44032ceb76344579e56208f6
-  data.tar.gz: 7e454985a75a41b572b2a58c81e17187c831bccdaf693f59bba6bd59301dbae0b4f89aa59c7c5a63db1b6d093eb95cac070fa0433408c5b105174d8d7021538b
+  metadata.gz: 00267b25cab02516e97136634384f8f9c1b204ed7682350ebb4c7e946444fbba52508647ec64d0e9f6cf5cf544a04046cf74fc28a2b243d02c20ccb7aa2f4aa1
+  data.tar.gz: db8496b3fb5484d86ca5fbbc44eaa758b5c939f725a682bf55a3f2b215ca9030c39a150ce87b06357ed3697bc9ef60575b58225fbd4250e6716876464f02f565

data/History.txt

@@ -1,3 +1,5 @@
+#0.2.2
+* Added update functionality
 #0.2.0
 * Pulls HEAD of gaudi from GitHub in the scaffold 
 

data/lib/gaudi/scaffolding.rb

@@ -9,14 +9,15 @@ module Gaudi
   class Gem
     MAIN_CONFIG="system.cfg"
     PLATFORM_CONFIG="foo.cfg"
-    attr_reader :project_root
+    attr_reader :project_root,:gaudi_home
     #:nodoc:
     def self.options arguments
       options = OpenStruct.new
-      options.project_root = Dir.pwd
-      options.verbose = false
-      options.scaffold=false
-      options.version="HEAD"
+      options.project_root= Dir.pwd
+      options.verbose= false
+      options.scaffold= false
+      options.update= false
+      options.version= "HEAD"
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: gaudi [options]"
@@ -26,6 +27,12 @@ module Gaudi
         opts.on("-s", "--scaffold PATH","Create a Gaudi scaffold in PATH") do |proot|
           options.project_root=File.expand_path(proot)
           options.scaffold=true
+          options.update=false
+        end
+        opts.on("-u", "--update PATH","Update Gaudi core from GitHub on project at PATH") do |proot|
+          options.project_root=File.expand_path(proot)
+          options.update=true
+          options.scaffold=false
         end
         opts.separator ""
         opts.separator "Common options:"
@@ -50,11 +57,14 @@ module Gaudi
       opts=options(args)
       if opts.scaffold
         Gaudi::Gem.new(opts.project_root).project(opts.version)
+      elsif opts.update
+        Gaudi::Gem.new(opts.project_root).update(opts.version)
       end
     end
 
     def initialize project_root
       @project_root=project_root
+      @gaudi_home=File.join(project_root,"tools","build")
     end
     
     def project version
@@ -65,6 +75,12 @@ module Gaudi
       platform_config
       gaudi(version)
     end
+
+    def update version
+      raise "#{gaudi_home} is missing! Try creating a new Gaudi project first." unless File.exists?(gaudi_home)
+      FileUtils.rm_rf(File.join(gaudi_home,"lib/gaudi"))
+      core(version)
+    end
     #:nodoc:
     def directory_structure
       puts "Creating Gaudi filesystem structure at #{project_root}"
@@ -116,17 +132,40 @@ module Gaudi
         if File.exists?('gaudi')
           FileUtils.rm_rf('gaudi')
         end
-        system 'git clone https://github.com/damphyr/gaudi gaudi'
-        Dir.chdir('gaudi') do |d|
+        if system "git clone https://github.com/damphyr/gaudi #{tmp}/gaudi"
+          Dir.chdir("#{tmp}/gaudi") do |d|
+            puts "Packing #{version} gaudi version"
+            cmdline="git archive --format=tar -o #{project_root}/gaudilib.tar #{version} lib/"
+            system(cmdline)
+          end
+          puts "Unpacking in #{gaudi_home}"
+          Dir.chdir(project_root) do |d|
+            Archive::Tar::Minitar.unpack(File.join(project_root,'gaudilib.tar'), 'tools/build')
+          end
+          FileUtils.rm_rf(File.join(project_root,'gaudilib.tar'))
+          FileUtils.rm_rf(File.join(project_root,'tools/build/pax_global_header'))
+        else
+          raise "Cloning the Gaudi repo failed. Check that git is on the PATH and that GitHub is accessible"
+        end
+      end
+    end
+    #:nodoc:
+    def core(version)
+      Dir.mktmpdir do |tmp|
+        if File.exists?('gaudi')
+          FileUtils.rm_rf('gaudi')
+        end
+        system "git clone https://github.com/damphyr/gaudi #{tmp}/gaudi"
+        Dir.chdir("#{tmp}/gaudi") do |d|
           puts "Packing #{version} gaudi version"
-          cmdline="git archive --format=tar -o #{project_root}/gaudilib.tar #{version} lib/"
+          cmdline="git archive --format=tar -o #{project_root}/gaudicore.tar #{version} lib/gaudi"
           system(cmdline)
         end
-        puts "Unpacking in #{project_root}/tools/build"
+        puts "Unpacking core in #{gaudi_home}/lib/gaudi"
         Dir.chdir(project_root) do |d|
-          Archive::Tar::Minitar.unpack(File.join(project_root,'gaudilib.tar'), 'tools/build')
+          Archive::Tar::Minitar.unpack(File.join(project_root,'gaudicore.tar'), 'tools/build')
         end
-        FileUtils.rm_rf(File.join(project_root,'gaudilib.tar'))
+        FileUtils.rm_rf(File.join(project_root,'gaudicore.tar'))
         FileUtils.rm_rf(File.join(project_root,'tools/build/pax_global_header'))
       end
     end

data/lib/gaudi/version.rb

@@ -7,7 +7,7 @@ module Gaudi
       #Minor version
       MINOR=2
       #Tiny version
-      TINY=1
+      TINY=2
       #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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Vassilis Rizopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar