arver 0.1.2 → 0.1.3

data/lib/arver.rb

@@ -1,4 +1,4 @@
-%w{ singleton yaml fileutils active_support highline/import gpgme escape openssl}.each {|f| require f }
+%w{singleton yaml fileutils active_support highline/import gpgme escape openssl}.each {|f| require f }
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
  

data/lib/arver/adduser_action.rb

@@ -18,15 +18,10 @@ module Arver
     end
 
     def verify?( partition )
-      if not Arver::RuntimeConfig.instance.ask_password then
-        return false unless load_key( partition )
-      else
-        self.key= ask("Enter the password for the volume: #{partition.device}") {|q| q.echo = false}
-      end
-      unless( Arver::LuksWrapper.open?(partition).execute )
-        Arver::Log.error( "WARNING: "+partition.name+" is not open. skipping." )
-        return false
+      unless Arver::RuntimeConfig.instance.ask_password
+        return load_key( partition )
       end
+      self.key= ask("Enter the password for the volume: #{partition.device}") {|q| q.echo = false}
       true
     end
 
@@ -40,7 +35,7 @@ module Arver
 
       caller = Arver::LuksWrapper.addKey( slot_of_target_user.to_s, partition )
       caller.execute( key + "\n" + newkey )
-      
+
       unless( caller.success? )
         Arver::Log.error( "Could not add user to #{partition.path} \n #{caller.output}" )
         generator.remove_key( target_user, partition )

data/lib/arver/key_generator.rb

@@ -21,7 +21,7 @@ module Arver
     
     def dump
       @keys.each do | user, user_keys |
-        KeySaver.save( user, user_keys.to_yaml ) unless user_keys.empty?
+        KeySaver.add( user, user_keys.to_yaml ) unless user_keys.empty?
       end
       @keys = {}
     end

data/lib/arver/key_saver.rb

@@ -2,6 +2,20 @@ module Arver
   class KeySaver
     
     def self.save( user, key )
+      filename = save_tmp( user, key )
+      purge_keys(user)
+      FileUtils.mv("#{tmp_key_path(user)}", "#{key_path(user)}")
+      "#{key_path(user)}/#{filename}"
+    end
+
+    def self.add( user, key )
+      filename = save_tmp( user, key )
+      FileUtils.mkdir_p key_path(user) unless File.exists?( key_path(user) )
+      FileUtils.mv( Dir.glob("#{tmp_key_path(user)}/*"), "#{key_path(user)}")
+      "#{key_path(user)}/#{filename}"
+    end
+
+    def self.save_tmp( user, key )
       unless GPGKeyManager.check_key_of( user )
         return
       end
@@ -20,9 +34,9 @@ module Arver
       end
       key_encrypted = encrypted.read
       unless( Arver::RuntimeConfig.instance.dry_run )
-        FileUtils.mkdir_p key_path(user) unless File.exists?( key_path(user) )
-        filename = key_path(user)+"/"+OpenSSL::Digest::SHA1.new(key_encrypted).to_s
-        File.open( filename, 'w' ) do |f|
+        FileUtils.mkdir_p tmp_key_path(user) unless File.exists?( tmp_key_path(user) )
+        filename = "#{OpenSSL::Digest::SHA1.new(key_encrypted)}"
+        File.open( "#{tmp_key_path(user)}/#{filename}", 'w' ) do |f|
           f.write key_encrypted
         end
       end
@@ -30,7 +44,11 @@ module Arver
     end
     
     def self.key_path( user )
-      config_path+"/keys/"+user
+      "#{config_path}/keys/#{user}"
+    end
+    
+    def self.tmp_key_path( user )
+      "#{config_path}/tmp/#{user}"
     end
     
     def self.config_path

data/lib/arver/keystore.rb

@@ -21,7 +21,6 @@ module Arver
     end
     
     def save
-      purge_keys
       KeySaver.save(username, @keys.to_yaml)
     end
     

data/lib/arver/version.rb

@@ -1,3 +1,3 @@
 module Arver
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,103 +1,145 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: arver
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - o
 - andreas
 - mh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: gpgme
-  requirement: &7240120 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7240120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: escape
-  requirement: &7239180 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *7239180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &7238020 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7238020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: &7236760 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *7236760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &7235620 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *7235620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &7234840 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *7234840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &7233720 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *7233720
-description: Arver helps you to manage a large amount of crypted devices easily and
-  safe amongst a certain amount of members
+  version_requirements: *id007
+description: Arver helps you to manage a large amount of crypted devices easily and safe amongst a certain amount of members
 email: arver@lists.immerda.ch
-executables:
+executables: 
 - arver
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/arver.rb
 - lib/arver/action.rb
 - lib/arver/adduser_action.rb
@@ -142,26 +184,38 @@ files:
 - bin/arver
 homepage: https://github.com/arver/arver
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 1.8.10
+
+rubyforge_project: "[none]"
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Open crypted devices automatically
 test_files: []
+