rebuild 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343b48b597539921a27a9987311d27a768e3e215
-  data.tar.gz: fbf1d04ef67f928035c26173f089be49f9ebf2b1
+  metadata.gz: 9fdcc09677d6ab49d227c5b4a978498af058ba99
+  data.tar.gz: d1b805d6e750eb4a40008ae8994aec305d8730f4
 SHA512:
-  metadata.gz: a59dbc58f12a2066d0bc9889be8e2c1b9164c0854a00152ffc3a8bc4d8153367dbe9b71ef601e252aa43f9a6323b42081af53aa25c8b717baf82444a8597c888
-  data.tar.gz: 5fbfe3e2545d5d4f12dc612214c977d8a95514a62986fa369b559c9086a45ea87d080ed52abe0438fc859fe22cd8dd6fa7cde51c9beba4400f0d1df2728f9f48
+  metadata.gz: 5dbe1af4dc3033dd024037c83ee2b5349e6616b3b500d1e4b03cdefef78eb7c93aff1a6b64da30cef3011d552537fb8b2dcf3fa96d0031591dc45c0b9b1f51cc
+  data.tar.gz: d03a0d50cac8d0aadc9b9752fedb524b2324b332b6f4e555120d2399f7344df0559d6feb81bba1b0da865edebdacc61e6e15013eb9dd12473b84c5e750dde459

data/README.md

@@ -44,6 +44,13 @@ $ rebuild -d ~/src/github.com/k0kubun/dotfiles
 
 # Run /tmp/k0kubun/dotfiles/script/*.sh instead of /tmp/k0kubun/dotfiles/*.sh
 $ rebuild -s script
+
+# You can choose which script to run first by shell pipeline
+echo "first.sh second.sh" | rebuild
+rebuild <<-EOS
+  first.sh
+  second.sh
+EOS
 ```
 
 ## Supported OS

data/lib/rebuild/cli.rb

@@ -29,7 +29,7 @@ module Rebuild
         command = args.first
 
         if command.include?('/')
-          stdin = STDIN.gets unless STDIN.isatty
+          stdin = STDIN.read unless STDIN.isatty
           bootstrap(command, stdin, options)
         else
           run_command(command)
@@ -40,7 +40,7 @@ module Rebuild
 
       def bootstrap(repo, stdin, options)
         repo_path       = Repository.new(repo, options).fetch
-        primary_scripts = stdin
+        primary_scripts = (stdin || '').split
 
         runner = Runner.new(repo_path, primary_scripts, options[:scriptdir])
         runner.run

data/lib/rebuild/command_line_tools.rb

@@ -16,10 +16,13 @@ module Rebuild
       def install
         obtain_accesibility
 
+        Logger.info('Running command line tools installation...')
         `xcode-select --install`
+
         Script.execute_scpt('start_install')
         sleep 5 until installed?
         Script.execute_scpt('click_done')
+        Logger.success('Finished to install command line tools')
       end
 
       private

data/lib/rebuild/logger.rb

@@ -3,6 +3,7 @@ require 'rebuild'
 module Rebuild
   class Logger
     COLOR_CODE = {
+      red:   31,
       green: 32,
       cyan:  36,
     }
@@ -16,8 +17,17 @@ module Rebuild
         puts cyan(text)
       end
 
+      def fatal(text)
+        puts red("Error: #{text}")
+        exit(1)
+      end
+
       private
 
+      def red(text)
+        color_with(text, :red)
+      end
+
       def green(text)
         color_with(text, :green)
       end

data/lib/rebuild/runner.rb

@@ -1,4 +1,5 @@
 require 'rebuild'
+require 'set'
 
 module Rebuild
   class Runner
@@ -11,9 +12,10 @@ module Rebuild
     def run
       return no_script_found if script_paths.empty?
 
-      script_paths.each do |path|
-        Logger.info("Running #{path}...")
-        system('sh', path)
+      ordered_scripts.each do |script|
+        absolute_path = File.join(absolute_script_directory, script)
+        Logger.info("Running #{absolute_path}...")
+        system('sh', absolute_path)
       end
 
       Logger.finish("Finished to rebuild #{absolute_script_directory}")
@@ -21,6 +23,23 @@ module Rebuild
 
     private
 
+    def ordered_scripts
+      inexistent_scripts = @primary_scripts - existent_scripts
+      if inexistent_scripts.any?
+        Logger.fatal("#{inexistent_scripts.join(', ')} can't be found in #{absolute_script_directory}")
+      end
+
+      @primary_scripts + (existent_scripts - @primary_scripts)
+    end
+
+    def existent_scripts
+      target = File.join(absolute_script_directory, '*.sh')
+
+      Dir.glob(target).map do |full_path|
+        File.basename(full_path)
+      end
+    end
+
     def script_paths
       target = File.join(absolute_script_directory, '*.sh')
       Dir.glob(target)

data/lib/rebuild/version.rb

@@ -1,3 +1,3 @@
 module Rebuild
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rebuild
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Takashi Kokubun