duse 0.0.4 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDc4NmU1MWM3MzJhOGZhY2MxOWE1YjA3OTk0MDliNmEwNDg3NWI1Mw==
+    ODc4MDg1YmQ3NTU5OGI3NmQwYTk0ZjQxNTk2NjIyY2I1OTc2MDg4ZQ==
   data.tar.gz: !binary |-
-    NDQ4ZGRmNWI3MjI5ZjgxMDdkOWFjM2Q4Y2NlNzZiNzc1NTBhM2U3OA==
+    MWQ1ZjI5ODhjMmZjZTdhYmQ1ZGNjODMzYWFlMWRmNTllYjFjZDc2Nw==
 SHA512:
   metadata.gz: !binary |-
-    MGNlMzllOGQ5ODU2OGRmYWU1OWM0NzViYzU1ZWM4NjQ4MjViOTI3YmVkODU3
-    ODVkZTQ0N2UxNTFmMjgxMjg1OGJkYjNiNzAzOGM2MzE0YmFmOWJkMjBiMTgz
-    MGI0MDkwNGM5NWNjNTllMTNlYjcwNWNhZWUwN2RjN2JiOTdjYjM=
+    OTQyMjE2Y2QwZjk0YTlmZDNmZTQyYjc2MTUwNGFjYjY0NDM3ZTk3OGE2ZWFh
+    YjA3Mzk1NTAxYWMwNTU1YjQzNTMzYTAyMWIwMjhjNTVlMzIwOWU4YjY0OWI1
+    M2Q2MjA3ZmE3YWJhZjdjMDUyZDY0MjJjZWI1MmM5YzIxMzhjNmI=
   data.tar.gz: !binary |-
-    NTlhMjczMmIwOTM5MjI1NTczYTQwYTQyNjYwMWI0ODg4OWExZTYxMGE4Y2E4
-    N2FhMTQ0M2MzY2FiYmMyYmFmNWZhZWM0YzVkYTVjMzhmZDU3NWFlMjczYWJi
-    NjRhNjM5MTFkMmIxZDkyY2ZiYzRlODVlMGUwYWE4YThiOWIyYTg=
+    YjBjMjNhYTM5NjMwNmVmYzVhMDAyM2Y1MWFiYTI1Y2Y0ZjQ3ODdiNTYzMDc2
+    ZDdlYzU4NmRhODVmOWEwNDVhZmZhOTEzMmM3ZTgwYWIwZGE1MmNhZjdkNDI2
+    OTA0ZWE5NjNlNTVjYzI3ZmEzMDRlODgxMzU0MWIyMTYzODEwZmY=

data/duse.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files -z`.split("\x0")
 
   s.add_runtime_dependency 'highline'
-  s.add_runtime_dependency 'secret_sharing'
+  s.add_runtime_dependency 'secret_sharing', '>= 0.0.5'
   s.add_runtime_dependency 'faraday'
   s.add_runtime_dependency 'faraday_middleware'
 end

data/lib/duse/cli/account_confirm.rb

@@ -3,15 +3,12 @@ require 'duse/cli'
 module Duse
   module CLI
     class AccountConfirm < ApiCommand
-      description 'confirm your account'
+      description 'confirm your account with a token sent to your email'
 
       skip :authenticate
 
-      on('-t', '--token [TOKEN]', 'The token to use for confirming')
-
-      def run
-        self.token ||= terminal.ask("A confirmation email has been sent. A confirmation token was mentioned in it, please provide that token below.\n\ntoken: ")
-        Duse::User.confirm(self.token)
+      def run(token)
+        Duse::User.confirm(token)
         success 'Account successfully confirmed.'
       rescue Duse::Client::NotFound
         error 'Token is either not valid or has already been used.'

data/lib/duse/cli/api_command.rb

@@ -6,9 +6,7 @@ module Duse
       abstract
 
       def execute
-        ensure_uri_is_set
-        authenticate
-        run *arguments
+        super
       rescue Duse::Client::NotLoggedIn
         error "not logged in, run `#$0 login`"
       rescue Duse::Client::Error => e
@@ -19,6 +17,11 @@ module Duse
         say "\naborted!"
       end
 
+      def setup
+        ensure_uri_is_set
+        authenticate
+      end
+
       private
 
       def ensure_uri_is_set

data/lib/duse/cli/command.rb

@@ -41,11 +41,16 @@ module Duse
       end
 
       def execute
+        check_arity(method(:run), *arguments)
+        setup
         run *arguments
       rescue Interrupt
         say "\naborted!"
       end
 
+      def setup
+      end
+
       def output=(io)
         @terminal = nil
         @output = io
@@ -197,6 +202,21 @@ module Duse
         end
         usage << " [OPTIONS]"
       end
+
+      def check_arity(method, *args)
+        return unless method.respond_to? :parameters
+        method.parameters.each do |type, name|
+          return if type == :rest
+          wrong_args("few") unless args.shift or type == :opt or type == :block
+        end
+        wrong_args("many") if args.any?
+      end
+
+      def wrong_args(quantity)
+        error "too #{quantity} arguments" do
+          say help
+        end
+      end
     end
   end
 end

data/lib/duse/encryption.rb

@@ -92,7 +92,7 @@ module Duse
     end
 
     def encrypt_symmetric_key(symmetric_key, users, private_key)
-      raw_shares = SecretSharing.split_secret(symmetric_key, 2, users.length)
+      raw_shares = SecretSharing.split(symmetric_key, 2, users.length)
       users.map.with_index do |user, index|
         share = raw_shares[index]
         content, signature = Encryption::Asymmetric.encrypt(private_key, user.public_key, share)
@@ -104,7 +104,7 @@ module Duse
       raw_shares = shares.map do |share|
         Encryption::Asymmetric.decrypt private_key, share
       end
-      SecretSharing.recover_secret(raw_shares)
+      SecretSharing.reconstruct(raw_shares)
     end
   end
 end

data/lib/duse/version.rb

@@ -1,3 +1,3 @@
 module Duse
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duse
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Frederic Branczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement