magica 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9648f787f745dd428414d6a0df22c41c5cc5c230
-  data.tar.gz: 5942123320392e91dca6b4dddef6cae2ac19b1f5
+  metadata.gz: 0170d95ed71566285f2b7b5d903fa9c2b447f97c
+  data.tar.gz: 1d2cf2541c7910760fb1036b9dd0946bb6d37dff
 SHA512:
-  metadata.gz: 110f0160763ae847e2cad0c6a10c191d00bf456fc2a9a265160fe4d44e876bf1670c74827902813766e4b2e60bfb605d90d0745d64d3ab9daf87617928667981
-  data.tar.gz: e9e0031a46b037893bd71ef1e722af4e7c9f1a5119c337af99ed596b6105554ffc2190c9689598ae7c31eb7e987d8bcf45942b4f0a441c23ecef5323a7aba65b
+  metadata.gz: 3d5d8bee53d637e8f375507ed1b9b2ad842b19bc4687453594f0325942bbab87b07e075d0c4c3228f5cbea63f747235453ef8637715f7e8e745d3e9c29941f5a
+  data.tar.gz: b8be26e4404c06911c064972d546bd4e9cd18cebf78bdf6188abb00046c000dbbbd0563d09f315c505e9f793423cfebe4fc391151763bfdcc316d1983d70e46c

data/lib/magica/application.rb

@@ -46,7 +46,7 @@ module Magica
         switch =~ /--#{Regexp.union(not_applicable_to_magica)}/
       end
 
-      super.push(version, clean, clean_all, target)
+      super.push(version, clean, clean_all, rebuild, target)
     end
 
     def top_level_tasks
@@ -99,6 +99,14 @@ module Magica
        end]
     end
 
+    def rebuild
+      ['--rebuild', '-r',
+       'Rerun all dependency build command',
+       lambda do |_value|
+         options.rebuild = true
+       end]
+    end
+
     def target
       ['--target', '-t TARGET',
        'Specify the build to use',

data/lib/magica/build.rb

@@ -142,7 +142,7 @@ module Magica
       Dependency.new(self, name, options, &block)
       desc "The targets #{@name}'s dependency project : #{name}"
       task "#{@name}:dependency:#{name}" do
-        Dependency[name].build(self)
+        Dependency[name].build
       end
       @dependencies << "#{@name}:dependency:#{name}"
       @static_libraries.push(*Dependency[name].static_libraries)

data/lib/magica/dependency.rb

@@ -27,6 +27,7 @@ module Magica
       @dir = "lib/#{@name}"
       @install_dir = "#{@dir}/build"
       @build_command = 'make'
+      @clean_command = ''
       @environments = {}
 
       @static_libraries = []
@@ -66,17 +67,21 @@ module Magica
       @build_command = command.to_s
     end
 
+    def clean_command(command)
+      @clean_command = command.to_s
+    end
+
     def static_library(*name)
       @static_libraries.push(*name.flatten)
     end
 
-    def build(builder)
+    def build
       clean if @builder.options[:clean_all]
 
       return unless exec?
 
       setup_environment
-      clone(builder)
+      clone
       exec
     end
 
@@ -100,6 +105,7 @@ module Magica
 
     def exec?
       clean_all = @builder.options[:clean_all]
+      return true if @builder.options[:rebuild]
       return false if !clean_all & File.exist?(@install_dir)
       return false if !clean_all & @build_command.empty? & File.exist?(@dir)
       true
@@ -112,8 +118,10 @@ module Magica
       Dir.chdir root
     end
 
-    def clone(builder)
-      @vcs = builder.send(@command)
+    # rubocop:disable Metrics/MethodLength
+    def clone
+      return if @builder.options[:rebuild]
+      @vcs = @builder.send(@command)
       @vcs.flags = %w[--quiet]
 
       puts "UPDATE DEPENDENCY\t #{[@name, @version].join(' ')}"
@@ -126,6 +134,7 @@ module Magica
         checkout if @version
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def checkout
       @vcs.checkout(source_dir, @version)
@@ -146,7 +155,11 @@ module Magica
     end
 
     def clean
-      FileUtils.rm_r(@install_dir, force: true)
+      return FileUtils.rm_r(@install_dir, force: true) if @clean_command.empty?
+      root = Dir.pwd
+      Dir.chdir source_dir
+      sh @clean_command, verbose: false
+      Dir.chdir root
     end
   end
 end

data/lib/magica/version.rb

@@ -1,3 +1,3 @@
 module Magica
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magica
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake