mirrorworks 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0da08208a1d2ea56fec9b382602974852e3ef3
-  data.tar.gz: 38e022c740f21507f07eec06a628b1c5ef810d6f
+  metadata.gz: 58cb6b98f44aff4d8dbc13f4484dff1ade3803d1
+  data.tar.gz: afc17f0cc0320aaf5eddc94b0c67d458efc832ab
 SHA512:
-  metadata.gz: ceaab3fd63fea590e302e70099e34d3ee363a7e7ab27e67b63b3416dd1a26cc2cb06e619f6ef04a6d641b6bbcadb2a5fe3f58f12d48e6ed21a24b0cb4ca13755
-  data.tar.gz: 31df3fb01deac0c5ff2235f711f6f412dd6a07a3a138e2278913236f8f67ff3190cd1aae4dc7459f5dac94ac26952498f4dd696005fdf8ff096338a1a896c1cc
+  metadata.gz: ba6a4407b7b2f5d2b05e58e57f795dca3f6ee7f9cadaf9c73bef775f0229615884647c9e182c1efead09d34ae11bc19f093e990c0232b48381aeca8ac43ef06e
+  data.tar.gz: 995f9b9a4f0fbbf10340ab42aaa98b2cb585ac09a0d3d57ae0c9513dd2fb69b4848fc5e5246cbbd24c296a0b0f361ba393830ba78180b0dd06b4ffb0e06d2d7e

data/example.mirrorworksrc.json

@@ -1,5 +1,11 @@
 {
-  "rsync_opts": ["-irtupEl"],
+  "rsync_opts": [
+    "-rtupEl",
+    "--exclude=.git/*",
+    "--backup",
+    "--backup-dir=$HOME/.backup",
+    "--suffix=.$(date +%Y-%m-%d-%H-%M)"
+  ],
 
   "reflections": [
     {

data/lib/mirrorworks.rb

@@ -3,17 +3,18 @@ require 'fileutils'
 require 'rsync'
 require 'json'
 
-VERSION = '0.1.0'
+VERSION = '0.1.1'
 CONF_AT = File.join(Dir.home, '.mirrorworksrc.json')
 
 class Mirrorworks
 
   def initialize
-    @help_opts = ''
+    @help_msg = ''
     @options = {}
     @conf = {}
   end
 
+  private
 
   def parse_config
     unless File.readable? CONF_AT
@@ -23,30 +24,28 @@ class Mirrorworks
     @conf['rsync_opts'] << '--delete' if @options[:x]
   end
 
-
   def each_reflection(args)
     if args.empty?
       # use all reflections if none are given
-      @conf['reflections'].each {|r| yield r}
+      @conf['reflections'].each {|ref| yield ref}
     else
-      args.each do |a|
-        ref = nil
-        @conf['reflections'].each do |r|
-          if args.include? r['name']
-            ref = r
+      args.each do |arg|
+        selected = nil
+        @conf['reflections'].each do |ref|
+          if arg == ref['name']
+            selected = ref
             break
           end
         end
-        if ref.nil?
-          raise "No reflection '#{a}'"
+        if selected.nil?
+          raise "No reflection '#{arg}'"
         else
-          yield ref
+          yield selected
         end
       end
     end
   end
 
-
   def install
     src = File.join(File.dirname(__FILE__), '..', 'example.mirrorworksrc.json')
     raise "#{CONF_AT} already exists. Nothing to do." if File.exists? CONF_AT
@@ -54,59 +53,62 @@ class Mirrorworks
     puts "Created example config at #{CONF_AT}"
   end
 
+  def transfer(src, dest)
+    src.gsub! ' ', '\ '
+    dest.gsub! ' ', '\ '
+    result = Rsync.run(src, dest, @conf['rsync_opts'])
+    raise result.error unless result.success?
+    result.changes.each do |c|
+      unless c.update_type == :no_update
+        summary = c.summary.empty? ? "\t" : c.summary
+        puts summary << "\t" << c.filename
+      end
+    end
+    puts
+  end
 
   def push(args)
     each_reflection(args) do |ref|
       puts ">>>> Pushing #{ref['name']} >>>>"
-      src = ref['local'].sub(' ', '\ ')
-      dest = ref['remote'].sub(' ', '\ ')
-      result = Rsync.run(src, dest, @conf['rsync_opts'])
-      raise result.error unless result.success?
-      result.changes.each {|c| puts c.filename}
-      puts
+      src = ref['local']
+      dest = ref['remote']
+      transfer(src, dest)
     end
   end
 
   def pull(args)
     each_reflection(args) do |ref|
       puts "<<<< Pulling #{ref['name']} <<<<"
-      src = ref['remote'].sub(' ', '\ ')
-      dest = ref['local'].sub(' ', '\ ')
-      result = Rsync.run(src, dest, @conf['rsync_opts'])
-      raise result.error unless result.success?
-      result.changes.each {|c| puts c.filename}
-      puts
+      src = ref['remote']
+      dest = ref['local']
+      transfer(src, dest)
     end
   end
 
-
   def status(args)
-    each_reflection(args) do |ref|
-      @conf['rsync_opts'] << '-n'
-      push(args)
-      pull(args)
-    end
+    puts 'Starting dry run. No changes will be made.'
+    @conf['rsync_opts'] << '-n'
+    push(args)
+    pull(args)
+    puts 'End of dry run.'
   end
 
-
-  def list
-    @conf['reflections'].each do |r|
-      puts "Name: #{r['name']}",
-           "  Local:  #{r['local']}",
-           "  Remote: #{r['remote']}",
+  def list(args)
+    each_reflection(args) do |ref|
+      puts "Name: #{ref['name']}",
+           "  Local:  #{ref['local']}",
+           "  Remote: #{ref['remote']}",
            ''
     end
   end
 
-
   def version
     puts VERSION
     exit
   end
 
-
   def help
-    puts @help_opts
+    puts @help_msg
     puts '',
          '  Commands:',
          '    install     create example conf in home directory',
@@ -121,28 +123,18 @@ class Mirrorworks
     exit
   end
 
-
-  private :parse_config,
-          :each_reflection,
-          :install,
-          :push,
-          :pull,
-          :status,
-          :list,
-          :version,
-          :help
-
+  public
 
   def run(args)
     begin
       OptionParser.new do |opts|
-        opts.banner = 'Usage: mirrorworks [options...] <command> [reflections...]'
+        opts.banner = 'Usage: mirrorworks [options] <command> [reflections]'
         opts.on('-V', '--version', 'print version and exit') {version}
         opts.on('-h', '--help', 'print help and exit') {help}
         opts.on('-x', '--hard', 'delete extra files on transfer') do |x|
           @options[:x] = x
         end
-        @help_opts = opts.to_s
+        @help_msg = opts.to_s
       end.parse! args
 
       help if args.empty?
@@ -157,7 +149,7 @@ class Mirrorworks
       when 'status'
         status args
       when 'list'
-        list
+        list args
       when 'install'
         install
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mirrorworks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tyler Brazier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsync