ramdev 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c089e4b0d2b4a795153868719ac311302c3a92
-  data.tar.gz: e6a958654bbeb09344c16f906219497c750d7b8f
+  metadata.gz: 2d0dcbbd1cafd549bfc229205292d164511a834e
+  data.tar.gz: 5ffaedf402b00c472dfc42859452da63127f2371
 SHA512:
-  metadata.gz: 0c9f1ca55b4de6dc19b1cdea012b9bb9fb80d41381ccb578202fa3bb6549001f04b19e26b01e7e3c87d39bb7d15dec4caed19f46ffe8249fdb06deadcf18e30b
-  data.tar.gz: e499a8830accb95d90119b1fecfdd360eee8390a0cf3135052198658da96963b09500fd753e97604d16226cbedb65927cf7102d06bea344d773c8d8ee838df86
+  metadata.gz: 31e4ca813d43135eedf7a2a74cad872aeb5726cec978e4ff76e794fbdcca2ced68b7350a5b683f850621dc754c4ac0e9d51042232d4cb1361b72aadf0080da58
+  data.tar.gz: 50c04438232f6283ce65300ec917e542bbbc21f3b90e3a7c3c2f53190b68daf1a8e4425176cbf57f1c8c013aebcc009c47ba711115220eecd56688a8a202a5cf

data/bin/ramdev

@@ -8,30 +8,95 @@ require 'etc'
 #FIX: This is not windows compatible.
 
 Main do
+  option('version') do
+    description 'Get version.'
+  end
+
+  option('rcfile', 'r') do
+    argument_required
+    cast :string
+    description 'Manually set the rcfile to use.'
+  end
+
   mode 'up' do
+    option('memory','m') do
+      argument_required
+      validate {|m| m =~ /[Mm][Bb]|[Gg][Bb]$/}
+      cast :string
+      description 'Optional size of ramdisk in MB or GB, (i.e. -m 300MB)'
+    end
+
     def run
       user = Etc.getlogin
-      rcfile = File.join(Dir.home(user), ".ramdevrc")
+      if(params['rcfile'].given?)
+        rcfile = params['rcfile'].value
+      else
+        rcfile = File.join(Dir.home(user), ".ramdevrc")
+      end
+
+
+      if(params['memory'].given?)
+        memString = params['memory'].value
+
+        mem = memString[/^[0-9]+/].to_i * 1048576    if memString =~ /[Mm][Bb]$/
+        mem = memString[/^[0-9]+/].to_i * 1073741824 if memString =~ /[Gg][Bb]$/
+      end
 
       rd = RamDev.new
-      rd.build(rcfile) #10MB
+      if mem
+        rd.build(rcfile, mem)
+      else
+        rd.build(rcfile)
+      end
+
+    end
+  end
+
+  mode 'fix' do
+    def run
+      user = Etc.getlogin
+      if(params['rcfile'].given?)
+        rcfile = params['rcfile'].value
+      else
+        rcfile = File.join(Dir.home(user), ".ramdevrc")
+      end
+
+      rd = RamDev.new
+      rd.fix(rcfile)
     end
   end
 
   mode 'down' do
+    option('force', 'f') do
+      description 'Attempt to force ramdisk shutdown even if folder are in a bad state (only used for testing).'
+    end
+
     def run
       user = Etc.getlogin
-      rcfile = File.join(Dir.home(user), ".ramdevrc")
+      if(params['rcfile'].given?)
+        rcfile = params['rcfile'].value
+      else
+        rcfile = File.join(Dir.home(user), ".ramdevrc")
+      end
 
       rd = RamDev.new
-      rd.unbuild(rcfile)
+      if(params['force'].given?)
+        rd.unbuild(rcfile,force: true)
+      else
+        rd.unbuild(rcfile)
+      end
+
     end
   end
 
   def run()
-    puts 'Usage: ramdev [up|down]'
-    puts ''
-    puts "\tup\tCreate a ramdisk, move and link working folders."
-    puts "\tdown\tDeallocate ramdisk and restore all file paths."
+    if(params['version'].given?)
+      puts 'ramdev v0.2.0'
+    else
+      puts 'Usage: ramdev [up|down]'
+      puts ''
+      puts "\tup\tCreate a ramdisk, move and link working folders."
+      puts "\tdown\tDeallocate ramdisk and restore all file paths."
+    end
   end
 end

data/lib/ramdev.rb

@@ -2,6 +2,7 @@ require 'ramdisk'
 require 'ramdev_sync'
 require 'pstore'
 require 'fileutils'
+require 'rainbow'
 
 class RamDev
   attr_reader :diskname, :ramdisk, :mountpoint
@@ -12,11 +13,40 @@ class RamDev
     @store = PStore.new("/tmp/ramdev.pstore")
   end
 
-  def unbuild(rcpath)
+  def fix(rcpath)
+    load_runcom(rcpath)
+
+    watcher = RamDevSync.new(File.open(rcpath))
+
+    if watcher.running?
+      puts `ps #{watcher.pid}`
+      puts "It appears ramdev is still running at pid: #{watcher.pid}.".color(:yellow)
+      puts "Try 'ramdev down' first to fix any file linking problem."
+      puts "Otherwise kill the process first before running 'ramdev fix'."
+      return
+    end
+
+    @paths.each do |p|
+      src   = p["source"].gsub(/\/+$/,"")
+      if( File.exists?(src+@backupSuffix) )
+        if(!File.exists?(src) || File.symlink?(src))
+          FileUtils.safe_unlink(src) if File.symlink?(src)
+
+          puts "Moving backup: ".color(:green) + "#{src+@backupSuffix} to #{src}"
+          FileUtils.move(src+@backupSuffix, src)
+        else
+          puts "skipping file: ".color(:yellow) + ("#{src}")
+        end
+      end
+    end
+
+  end
+
+  def unbuild(rcpath, force = false)
     #TODO force sync
     load_runcom(rcpath)
 
-    if !restore_folders
+    if !force && !restore_folders
       puts "Ramdisk shutdown was halted because there was a problem restoring folders."
       puts "Eject the ramdisk manually once you've sorted out any issues."
       return
@@ -29,6 +59,10 @@ class RamDev
 
     Process.kill("QUIT", pid) if pid
 
+    @store.transaction do |s|
+      s["pid"] = nil
+    end
+
     ramdisk.unmount
     ramdisk.deallocate
 
@@ -51,14 +85,15 @@ class RamDev
   def build(rcpath, size = nil)
     @size = size
     @size ||= memory / 2
-    load_runcom(rcpath)
-
 
+    load_runcom(rcpath)
     ramdisk = Ramdisk.new(mountpoint)
 
-    puts "Allocating ramdisk size: #{@size / 1073741824} GB "
+    human_num = "#{@size / 1048576}".reverse.gsub(/...(?=.)/,'\&,').reverse
+    puts "Allocating ramdisk size: #{human_num} MB "
+
     if( !ramdisk.allocate(@size) )
-      puts "Allocation failed. Size: #{@size} bytes"
+      puts "Allocation failed. Size: #{human_num} MB"
       exit
     end
     if( !ramdisk.format(diskname, :hfs) )
@@ -72,17 +107,19 @@ class RamDev
     end
 
 
-    copy_folders if valid_paths?
+    if !valid_paths?
+      puts "paths are not valid!".color(:red)
+      raise(:hell)
+    end
+    copy_folders
 
     puts "RAM disk mounted at #{mountpoint}"
 
     #FIX: Not compatible with Windows:
 
-
-
-
     fork do
       puts "ramdev_sync pid #{Process.pid}"
+      File.open("/tmp/ramdev_sync.pid", "w") {|f| f.write("#{Process.pid}\n")}
 
       @store.transaction do |s|
         s["pid"] = Process.pid

data/lib/ramdev_sync.rb

@@ -2,13 +2,14 @@
 
 require 'listen'
 require 'yaml'
-# require 'pstore'
-# store = PStore.new("ramdev_sync.pstore")
+require 'pstore'
 
 class RamDevSync
   attr_reader :paths, :listener
 
   def initialize(rcpath, sufix = "_ramdev")
+    @store = PStore.new("/tmp/ramdev.pstore")
+
     @backupSuffix = sufix
     load_runcom(rcpath)
 
@@ -47,7 +48,27 @@ class RamDevSync
 
   def running?
     return true if !@listener.nil? && @listener.listen?
-    return false
+    begin
+      pid = @store.transaction do |s|
+        s["pid"]
+      end
+      return false if pid.nil?
+      Process.kill(0, pid)
+      return true
+    #rescue Errno::ESRCH #not running or zombied
+    #rescue Errno::EPERM #permission denied to query
+    rescue
+      @store.transaction do |s|
+        s["pid"] = nil
+      end
+      return false
+    end
+  end
+
+  def pid
+    @store.transaction do |s|
+      s["pid"]
+    end
   end
 
   def watchpaths

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: ramdev
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joshua Kolden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.99.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.99.1
 description: A management tool for creating a ramdrive and syncing folders back to
   the hard drive automatically while you work.
 email:
@@ -77,12 +91,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []