nfsadmin 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b6408e762bae666a4ac9a02272fee6dfc83f036
-  data.tar.gz: e5569e448ff209e9c1e52b9ca3e725a8041a5ea4
+  metadata.gz: 8a4ade82f161c6de715391d95d43c45b0d999135
+  data.tar.gz: f27866c6cb23523f7492d227a0d497d91a23a335
 SHA512:
-  metadata.gz: e96b2bcb0aedbd0c763390084c417bc80342a44faa97347bffc1492448e0292446c2495e65c4c09eda243215838e8f5d8baedefed2535765eb2e183c9c541d0f
-  data.tar.gz: 429a729e61a58f0b4731bd0019dfc484f74a3eea385c5c1a1cbba77649ae695bf385e88f7d8c30514f130fa55fffb730595bd5cbe69ccf0ffa563b2226b0d695
+  metadata.gz: 5dea59632b93fb1df2c210e9ddb6b6fc2a297b2e861e26b601594822b7a378888c57744f3a71533619198c3575c8cfd5bad2594812d76592c5a791ebd7f793a5
+  data.tar.gz: a959e3f73eff8e24ccb4a55091481b7df2a13e9ffaad0372a4fb3e0e830a4decb7f3c47197117c4771fc9ddd50d7d6c4fa57c9785e39f9f46532fe82fd86cf7a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nfsadmin (0.0.2)
+    nfsadmin (0.0.3)
       gli (~> 2.9)
 
 GEM

data/bin/nfsadmin

@@ -33,8 +33,10 @@ command :export do |c|
     add.flag [:a, :address]
     add.desc 'The NFS options for this share, e.g. rw,sync,no_root_squash,no_subtree_check'
     add.flag [:o, :options]
+    add.desc 'This option forces the location to be created'
+    add.switch [:c, :create]
     add.action do |global_options,options,args|
-      Nfsadmin::Tasks.create_share(global_options[:c], options[:l], options[:a], options[:o])
+      Nfsadmin::Tasks.create_share(global_options[:c], options[:l], options[:a], options[:o], options[:c])
     end
   end
 
@@ -48,7 +50,7 @@ command :export do |c|
   c.desc 'Get information about a specific share'
   c.command [:get] do |get|
     get.action do |global_options,options,args|
-      Nfsadmin::Tasks.get_share(global_options[:c], options[:l], options[:f])
+      Nfsadmin::Tasks.print_share(global_options[:c], options[:l], options[:f])
     end
   end
 end

data/lib/nfsadmin/tasks.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'fileutils'
 
 module Nfsadmin
 
@@ -72,9 +73,11 @@ module Nfsadmin
       end
     end
 
-    def self.create_share(exportsfile, location, address, options)
+    def self.create_share(exportsfile, location, address, options, createlocation)
       if location.nil?
         fail 'Location must be specified'
+      else
+        fail 'Location must be an absolute path' unless (Pathname.new(location)).absolute?
       end
       if address.nil?
         fail 'Address must be specified'
@@ -82,6 +85,9 @@ module Nfsadmin
       if options.nil?
         fail 'Options must be specified'
       end
+      if createlocation
+        FileUtils::mkdir_p location unless File.directory?(location)
+      end
       share = { :location => location,
                 :acl => [{
                     :address => address,
@@ -93,6 +99,7 @@ module Nfsadmin
       if existingshare.nil?
         shares << share
         write_exports(exportsfile, shares)
+        puts 'Share created'
       else
         puts 'Share already exists. Use nfsadmin export modify to change it. Skipping'
       end
@@ -104,16 +111,28 @@ module Nfsadmin
       end
       shares = get_shares(exportsfile)
       share = shares.find { |share| share[:location] == location }
-      shares.delete(share)
-      write_exports(exportsfile, shares)
+      if share.nil?
+        fail "#{location} not found"
+      else
+        shares.delete(share)
+        write_exports(exportsfile, shares)
+        puts "Deleted #{location}"
+      end
     end
 
-    def self.get_share(exportsfile, location, output_type)
+    def self.get_share(exportsfile, location)
       if location.nil?
         fail 'Location must be specified with -l or --location='
       end
       shares = get_shares(exportsfile)
-      share = shares.find { |share| share[:location] == location }
+      shares.find { |share| share[:location] == location }
+    end
+
+    def self.print_share(exportsfile, location, output_type)
+      share = get_share(exportsfile, location)
+      if share.nil?
+        fail 'share not found'
+      end
       if output_type.downcase == 'text'
         printf('%-40s', share[:location])
         share[:acl].each do |acl|

data/lib/nfsadmin/version.rb

@@ -1,3 +1,3 @@
 module Nfsadmin
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfsadmin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bastiaan Schaap