rebuild 0.0.4.pre8 → 0.0.4.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a38ea1e5ee724d661413c3074ed26aba2391494
-  data.tar.gz: 038448bc67e603d094dd7f64efae853ae99db504
+  metadata.gz: 3333b513c20e335f6fc9cfb12d16f92b813f2fbe
+  data.tar.gz: edc08fd52d002bdabc5d45b205295c1ed3eac6e3
 SHA512:
-  metadata.gz: 34e343442785e61a6860a79d4a07e7e588497e4230a164952d861b390a72614d044356c38bd1f8275d5c39acd716fa69829a432f21a1d7a79632cc02993359dd
-  data.tar.gz: e2ec36a90fa56a6bd74dcdff6c10afbf37047272ccfed7f2267b7395034344211144595172ebd473fbfd52f52fd2525e0fbc12cc6e7f0cac600e716ca0d84c50
+  metadata.gz: aad027253df70ce5af212e406e91153405a70d43ea7ac14d10051b0a1b26575f30fcf150b6febbdff3bc6cd30b7d44933760b114f27e75f3a4c0e5acf93d31ee
+  data.tar.gz: 968ee4a3be166778d0c5a5c28d9708c26dfeb6a581cd6791bcc6a3562e588ed952cd8a55b5bea176d2f56ff5ef9a0cd4fd7f0c781efff5db9912bcf79344a336

data/lib/rebuild.rb

@@ -1,5 +1,5 @@
-require 'rebuild/bootstrap'
 require 'rebuild/cli'
+require 'rebuild/command_line_tools'
 require 'rebuild/repository'
 require 'rebuild/runner'
 require 'rebuild/version'

data/lib/rebuild/cli.rb

@@ -1,34 +1,43 @@
 require 'rebuild'
-require 'unindent'
 
 module Rebuild
   class CLI
     class << self
       def start
-        bootstrap = Bootstrap.new
-        if bootstrap.installed?
-          show_usage if ARGV.empty?
-        else
-          bootstrap.install
+        return show_usage if ARGV.empty? && CommandLineTools.installed?
+
+        unless CommandLineTools.installed?
+          CommandLineTools.install
+        end
+
+        if ARGV.any?
+          stdin = STDIN.gets unless STDIN.isatty
+          bootstrap(ARGV, stdin)
         end
-        return if ARGV.empty?
+      end
+
+      private
 
-        repo_path       = Repository.new(ARGV.first).fetch
-        primary_scripts = STDIN.gets unless STDIN.isatty
+      def bootstrap(args, stdin)
+        repo_path       = Repository.new(args.first).fetch
+        primary_scripts = stdin
 
         runner = Runner.new(repo_path, primary_scripts)
         runner.run
       end
 
-      private
-
       def show_usage
-        puts <<-EOS.unindent
+        puts unindent(<<-EOS)
           Commands:
             rebuild USER/PROJECT # execute all scripts in GitHub repo's root directory
 
         EOS
       end
+
+      def unindent(text)
+        indent = text.split("\n").select {|line| !line.strip.empty? }.map {|line| line.index(/[^\s]/) }.compact.min || 0
+        text.gsub(/^[[:blank:]]{#{indent}}/, '')
+      end
     end
   end
 end

data/lib/rebuild/command_line_tools.rb

@@ -0,0 +1,42 @@
+require 'rebuild'
+
+module Rebuild
+  class CommandLineTools
+    DATABASE          = '/Library/Application\ Support/com.apple.TCC/TCC.db'
+    BUNDLE_IDENTIFIER = 'com.apple.Terminal'
+
+    class << self
+      def installed?
+        system('xcode-select -p > /dev/null 2>&1')
+      end
+
+      def install
+        obtain_accesibility
+
+        `xcode-select --install`
+        execute_scpt('start_install')
+
+        sleep 5 until installed?
+        execute_scpt('click_finish')
+      end
+
+      private
+
+      # Enable Security & Privacy > Privacy > Accessibility for Terminal.app.
+      def obtain_accesibility
+        puts "Require accessibility for Terminal.app to click buttons"
+        sql = <<-SQL
+          INSERT OR REPLACE INTO access
+          VALUES('kTCCServiceAccessibility','#{BUNDLE_IDENTIFIER}',0,1,1,NULL);
+        SQL
+        `sudo sqlite3 #{DATABASE} "#{sql}"`
+      end
+
+      def execute_scpt(name)
+        script_dir  = File.expand_path('../../../script', __FILE__)
+        script_path = File.join(script_dir, "#{name}.scpt")
+        `sudo osascript #{script_path}`
+      end
+    end
+  end
+end

data/lib/rebuild/version.rb

@@ -1,3 +1,3 @@
 module Rebuild
-  VERSION = '0.0.4.pre8'
+  VERSION = '0.0.4.pre9'
 end

data/rebuild.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "unindent", "~> 1.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/script/start_install.scpt

@@ -1,7 +1,7 @@
 #!/usr/bin/env osascript
 
 -- Fist: Click Install Button
-set timeoutSeconds to 8.0
+set timeoutSeconds to 1.0
 
 my doWithTimeout("click UI Element \"Install\" of window 1 of application process \"Install Command Line Developer Tools\"", timeoutSeconds)
 my doWithTimeout("click UI Element \"Agree\" of window 1 of application process \"Install Command Line Developer Tools\"", timeoutSeconds)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rebuild
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre8
+  version: 0.0.4.pre9
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: unindent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,8 +53,8 @@ files:
 - Rakefile
 - bin/rebuild
 - lib/rebuild.rb
-- lib/rebuild/bootstrap.rb
 - lib/rebuild/cli.rb
+- lib/rebuild/command_line_tools.rb
 - lib/rebuild/repository.rb
 - lib/rebuild/runner.rb
 - lib/rebuild/version.rb

data/lib/rebuild/bootstrap.rb

@@ -1,42 +0,0 @@
-require 'rebuild'
-require 'open3'
-
-module Rebuild
-  class Bootstrap
-    DATABASE          = '/Library/Application\ Support/com.apple.TCC/TCC.db'
-    BUNDLE_IDENTIFIER = 'com.apple.Terminal'
-
-    def installed?
-      system('xcode-select -p > /dev/null 2>&1')
-    end
-
-    def install
-      return if installed?
-      obtain_accesibility
-
-      `xcode-select --install`
-      execute_scpt('start_install')
-
-      sleep 5 until installed?
-      execute_scpt('click_finish')
-    end
-
-    private
-
-    # Enable Security & Privacy > Privacy > Accessibility for Terminal.app.
-    def obtain_accesibility
-      puts "Require accessibility for Terminal.app to click buttons"
-      sql = <<-SQL
-        INSERT OR REPLACE INTO access
-        VALUES('kTCCServiceAccessibility','#{BUNDLE_IDENTIFIER}',0,1,0,NULL);
-      SQL
-      `sudo sqlite3 #{DATABASE} "#{sql}"`
-    end
-
-    def execute_scpt(name)
-      script_dir  = File.expand_path('../../../script', __FILE__)
-      script_path = File.join(script_dir, "#{name}.scpt")
-      `sudo osascript #{script_path}`
-    end
-  end
-end