rebuild 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d1d8b1006fc9b0b374450736840721459dd9813
-  data.tar.gz: caaa6b97f4539931a7815689775ce153da7a8b7f
+  metadata.gz: 2891f67ffcdba95f4dcb3f9dd6231ce53496b72c
+  data.tar.gz: 8ce6ba5068b06c065c3f0017096786ea2e6160d3
 SHA512:
-  metadata.gz: 00fe864ce92da6d09e299baa326babc0c2708e8076ccb3ce408d301d89264724c7b712c4e55616c3314f1bd6c17cd664d29b43333ac8a1322b005cf196b02219
-  data.tar.gz: 3dbaccef58ff0ceaa7d70cc54618e07fa75e678e034d072843224cbd0f10909646863eeaa7e1000fae0b67f84d72bb073ab1e3fb9de849b2c1f0e6d5e10adb0e
+  metadata.gz: 8c7d8e88235b631955f2452a05cf5862a4cd656bd920452fae65cd023d3395d2a1aba2df366515ac5e1a25628dd2aba37658ca3121da273c601326bf23f0c6dc
+  data.tar.gz: fa82f426ed853245657fd25c1c38842861ca2ae0adf3aa112c8267639a32c00d11818fe4aa7451cb156761bc6e7fc323b51d2265dc0e302878c7cacdd4ef2e68

data/README.md

@@ -42,8 +42,8 @@ Prior to 10.8 Mountain Lion, features except command line tools installation are
 ## TODO
 
 - revision lock
-- clone directory change option
 - support script directory to put scripts
+- more flexible upstream pull
 
 ## License
 

data/gempush.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require_relative './lib/rebuild/version'
+`gem build rebuild.gemspec`
+`gem push rebuild-#{Rebuild::VERSION}.gem`

data/lib/rebuild/cli.rb

@@ -1,24 +1,31 @@
 require 'rebuild'
+require 'optparse'
 
 module Rebuild
   class CLI
     class << self
       def start
-        return show_usage if ARGV.empty? && CommandLineTools.installed?
+        options = {}
+
+        opt = OptionParser.new
+        opt.on('-d', '--directory=VAL') { |v| options[:directory] = v }
+
+        args = opt.parse!(ARGV)
+        return show_usage if args.empty? && CommandLineTools.installed?
 
         CommandLineTools.install unless CommandLineTools.installed?
         License.agree            unless License.agreed?
 
-        if ARGV.any?
+        if args.any?
           stdin = STDIN.gets unless STDIN.isatty
-          bootstrap(ARGV, stdin)
+          bootstrap(args, stdin, options)
         end
       end
 
       private
 
-      def bootstrap(args, stdin)
-        repo_path       = Repository.new(args.first).fetch
+      def bootstrap(args, stdin, options)
+        repo_path       = Repository.new(args.first, options[:directory]).fetch
         primary_scripts = stdin
 
         runner = Runner.new(repo_path, primary_scripts)
@@ -30,6 +37,9 @@ module Rebuild
           Commands:
             rebuild USER/PROJECT # execute all scripts in GitHub repo's root directory
 
+          Options:
+            -d, [--directory=/path/to/clone] # Default: /tmp/USER/PROJECT
+
         EOS
       end
 

data/lib/rebuild/command_line_tools.rb

@@ -2,8 +2,11 @@ require 'rebuild'
 
 module Rebuild
   class CommandLineTools
-    DATABASE          = '/Library/Application\ Support/com.apple.TCC/TCC.db'
-    BUNDLE_IDENTIFIER = 'com.apple.Terminal'
+    DATABASE            = '/Library/Application\ Support/com.apple.TCC/TCC.db'
+    SUPPORTED_TERMINALS = %w[
+      com.apple.Terminal
+      com.googlecode.iterm2
+    ]
 
     class << self
       def installed?
@@ -23,12 +26,14 @@ module Rebuild
 
       # 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}"`
+        puts 'Require accessibility for terminal to click buttons'
+        SUPPORTED_TERMINALS.each do |bundle_identifier|
+          sql = <<-SQL
+            INSERT OR REPLACE INTO access
+            VALUES('kTCCServiceAccessibility','#{bundle_identifier}',0,1,0,NULL);
+          SQL
+          `sudo sqlite3 #{DATABASE} "#{sql}"`
+        end
       end
 
       def execute_scpt(name)

data/lib/rebuild/repository.rb

@@ -3,12 +3,11 @@ require 'fileutils'
 
 module Rebuild
   class Repository
-    FETCH_REFERENCE = 'master'
-    FETCH_DIRECTORY = '/tmp'
+    DEFAULT_DIRECTORY = '/tmp'
 
-    def initialize(path)
+    def initialize(path, directory)
       @user, @repo = path.split('/')
-      @reference   = FETCH_REFERENCE
+      @directory   = directory
 
       abort "Invalid repository `#{path}`" if @repo.nil?
     end
@@ -26,7 +25,7 @@ module Rebuild
     private
 
     def clone_repository
-      FileUtils.mkdir_p(user_path)
+      FileUtils.mkdir_p(upper_directory)
       `git clone #{github_repository} #{repo_path}`
     end
 
@@ -54,11 +53,27 @@ module Rebuild
     end
 
     def repo_path
-      File.join(user_path, @repo)
+      File.join(upper_directory, root_directory)
+    end
+
+    def root_directory
+      if @directory
+        @directory.gsub(/\/$/, '').match(/[^\/]+$/).to_s
+      else
+        @repo
+      end
+    end
+
+    def upper_directory
+      if @directory
+        @directory.gsub(/[^\/]+\/?$/, '')
+      else
+        user_path
+      end
     end
 
     def user_path
-      File.join(FETCH_DIRECTORY, @user)
+      File.join(DEFAULT_DIRECTORY, @user)
     end
   end
 end

data/lib/rebuild/version.rb

@@ -1,3 +1,3 @@
 module Rebuild
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rebuild
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -55,6 +55,7 @@ files:
 - README.md
 - Rakefile
 - bin/rebuild
+- gempush.rb
 - lib/rebuild.rb
 - lib/rebuild/cli.rb
 - lib/rebuild/command_line_tools.rb