git-fyncy 0.6.2 → 0.7.0

data/bin/git-fyncy

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require 'git-fyncy'
 
-GitFyncy::main(*ARGV)
+GitFyncy.main(ARGV)

data/lib/git-fyncy/logger.rb

@@ -0,0 +1,11 @@
+module GitFyncy
+  class Logger
+    def initialize(background)
+      @log = !(STDOUT.tty? && background)
+    end
+
+    def log(thing)
+      puts thing if @log
+    end
+  end
+end

data/lib/git-fyncy/remote.rb

@@ -4,25 +4,32 @@ module GitFyncy
   class Remote
     include Utils
 
-    def initialize(remote, path, rsync_args)
+    def initialize(logger, remote, path, rsync_args)
+      @logger = logger
       @remote = remote
       @path = slashify path
       @rsync_flags = rsync_args.join(" ")
+
+      # COMMANDS
+      @rm_cmd = "cd #{@path}; rm -f %{paths}"
+      @rm_cmd = "ssh #{@remote} '#{@rm_cmd}'" if @remote
+      path = @remote ? "#{@remote}:#{@path}" : @path
+      @rsync_cmd = "rsync -zpR --checksum #{@rsync_flags} %{paths} #{path}"
     end
 
-    def command(cmd)
-      puts cmd.length < 80 ? cmd : cmd[0...77] + '...'
+    def command(cmd, paths)
+      return if paths.empty?
+      cmd = cmd % {paths: paths.to_a.join(' ')}
+      @logger.log cmd
       system cmd
     end
 
-    def scp(paths, rsync_args=[])
-      return if paths.empty?
-      command "rsync -zpR --checksum #{@rsync_flags} #{paths.to_a.join ' '} #{@remote}:#{@path}"
+    def rsync(paths)
+      command @rsync_cmd, paths
     end
 
-    def ssh_rm(paths)
-      return if paths.empty?
-      command "ssh #{@remote} 'cd #{@path}; rm -f #{paths.to_a.join ' '}'"
+    def rm(paths)
+      command @rm_cmd, paths
     end
   end
 end

data/lib/git-fyncy/repo.rb

@@ -15,13 +15,13 @@ module GitFyncy
     end
 
     module ClassMethods
-      [:remote_name, :url].each do |name|
+      GIT_CONFIG.each do |name, key|
         define_method("#{name}_from_config") do
-          get_stdout_str "git config --get #{GIT_CONFIG.fetch(name)}"
+          get_stdout_str "git config --get #{key}"
         end
 
         define_method("configure_fyncy_#{name}") do |val|
-          system "git config --add #{GIT_CONFIG.fetch(name)} '#{val}'"
+          system "git config --add #{key} '#{val}'"
         end
       end
     end
@@ -46,6 +46,11 @@ module GitFyncy
 
     def self.host_and_path_from_url(url)
       md = SSH_URL_REGEX.match url
+      user = nil
+      host = nil
+      remote = nil
+      path = url
+
       if md
         user = md[1]
         host = md[2]
@@ -56,15 +61,15 @@ module GitFyncy
         path = md[4]
       else
         md = SCP_REGEX.match url
-        unless md
-          pexit "Could not determine host and path from url (#{url}). To work with git-fyncy, the remote's url should be an ssh (i.e. start with \"ssh://\") or scp (i.e. USER@HOST:PATH) style url."
+        if md
+          user = md[1]
+          host = md[2]
+          path = slashify remove_trailing_git md[3]
         end
-        user = md[1]
-        host = md[2]
-        path = slashify remove_trailing_git md[3]
       end
 
-      ["#{user}#{host}", path]
+      remote = "#{user}#{host}" if user && host
+      [remote, path]
     end
 
     def self.host_and_path_for_remote(remote_name)
@@ -77,14 +82,14 @@ module GitFyncy
       prompt = <<-EOS
 No remote configured. git fyncy looks under the fyncy section of your git
 config for a remote name or a url (i.e. at fyncy.remote and fyncy.url). If a
-remote name is specified, that remote's url be used with any ".git" suffix
-removed.
+remote name is specified, that remote's url will be used with the ".git" suffix
+removed if it exists.
 
 Enter a remote name to use (or press return to use #{DEFAULT_REMOTE}): 
 EOS
       print prompt.chomp
 
-      remote_name = gets.chomp
+      remote_name = STDIN.gets.chomp
       remote_name = DEFAULT_REMOTE if remote_name.empty?
       if remote_defined?(remote_name)
         puts
@@ -105,7 +110,7 @@ EOS
       return host_and_path_from_url url if url
 
       remote_name = remote_name_from_config
-      remote_name = prompt_user_for_remote_name unless remote_name
+      remote_name = prompt_user_for_remote_name if STDIN.tty? && !remote_name
       res = nil
       res = host_and_path_for_remote remote_name if remote_name
       res = host_and_path_for_remote DEFAULT_REMOTE unless res

data/lib/git-fyncy/synchronizer.rb

@@ -1,24 +1,30 @@
 require 'git-fyncy/utils'
 require 'git-fyncy/repo'
 require 'git-fyncy/remote'
+require 'git-fyncy/logger'
 require 'listen'
 
 module GitFyncy
   class Synchronizer
     include Utils
 
-    def initialize(extra_rsync_args)
+    def initialize(background, extra_rsync_args)
       remote, path = Repo.host_and_path_from_current_repo
-      pexit 'A remote and path must be specified' unless remote && path
-      @remote = Remote.new remote, path, extra_rsync_args
+      pexit 'A remote and path must be specified' unless path
+      @background = background
+      @logger = Logger.new background
+      @remote = Remote.new @logger, remote, path, extra_rsync_args
     end
 
     def sync
-      @remote.scp Repo.git_aware_files
+      @remote.rsync Repo.git_aware_files
     end
 
+    # Listen to file changes, forking to the background first if background is
+    # true.
     def listen
-      puts "GIT FYNCY: Listening @ #{Time.now.ctime}"
+      daemonize if @background
+      @logger.log "GIT FYNCY: Listening @ #{Time.now.ctime}"
       relpath = method :relative_path
       files_to_remove = Set.new
       begin
@@ -27,20 +33,29 @@ module GitFyncy
             self.sync
             rel_removed = removed.map(&relpath)
             files_to_remove.merge rel_removed
-            files_to_remove.clear if @remote.ssh_rm files_to_remove
+            files_to_remove.clear if @remote.rm files_to_remove
           rescue => e
-            puts e.inspect
+            @logger.log e.inspect
           end
         end
       rescue SignalException
         exit 42
       ensure
-        puts "\n"
+        @logger.log "\n"
       end
     end
 
     private
 
+    def daemonize
+      pid = fork
+      if pid # parent
+        File.write ".git-fyncy-pid", pid
+        Process.detach pid
+        exit 0
+      end
+    end
+
     def relative_path(path)
       path.slice! slashify(Dir.pwd)
       path

data/lib/git-fyncy/version.rb

@@ -1,3 +1,3 @@
 module GitFyncy
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/git-fyncy.rb

@@ -1,23 +1,49 @@
 require "git-fyncy/version"
-require "git-fyncy/synchronizer"
+require 'git-fyncy/synchronizer'
 require 'listen'
 
 module GitFyncy
   extend Utils
+  PID_FNAME = ".git-fyncy-pid".freeze
 
-  def self.main(*extra_rsync_args)
-    working_dir = `git rev-parse --show-toplevel`.chomp
+  def self.already_running?
+    File.exists? PID_FNAME
+  end
 
-    if working_dir.empty?
-      pexit "Must be in a git repository"
+  def self.kill
+    if already_running?
+      pid = File.read(PID_FNAME).to_i
+      if Process.kill "TERM", pid
+        File.delete PID_FNAME
+      else
+        pexit "Failed to kill process with id #{pid}"
+      end
+    else
+      pexit "No process to kill. No #{PID_FNAME} file."
     end
+  end
+
+  FLAGS = %w(--fork --kill).to_set.freeze
+  def self.main(args)
+    working_dir = `git rev-parse --show-toplevel`.chomp
+
+    pexit 'Must be in a git repository' if working_dir.empty?
 
     Dir.chdir working_dir
+    return kill if args.include? "--kill"
+    if already_running?
+      pexit "#{PID_FNAME} exists. Is git fyncy already running?"
+    end
 
-    synchronizer = Synchronizer.new extra_rsync_args
+    rsync_args = args.reject { |arg| FLAGS.include? arg }
+    # Listen in the background if one of the args was '--fork'.
+    background = args.include? "--fork"
+
+    synchronizer = Synchronizer.new background, rsync_args
     unless synchronizer.sync
       pexit "\nGIT FYNCY: First remote command failed, exiting"
     end
+
     synchronizer.listen
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fyncy
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &15747200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,12 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *15747200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: The funky git aware syncer.
 email:
 - ryan@ryanmcg.com
@@ -39,6 +44,7 @@ files:
 - bin/git-fyncy
 - git-fyncy.gemspec
 - lib/git-fyncy.rb
+- lib/git-fyncy/logger.rb
 - lib/git-fyncy/remote.rb
 - lib/git-fyncy/repo.rb
 - lib/git-fyncy/synchronizer.rb
@@ -65,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Want to sync the working directories of your git directory with a remote