rmega 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a223b72cd508e47946e1420769a7246fbeb0d5d
-  data.tar.gz: 2ee6197d9a398cb44adce16f0c19aead89bbc4f2
+  metadata.gz: 137fdede22cdd2e053dea69f98b227700a8b606f
+  data.tar.gz: 49ed20b4c7b0aa5419861c59f842f5a35a2a883d
 SHA512:
-  metadata.gz: c40f1ab57edec730541e3fe060f1f5352724a72fcff7f526ae5813ef45e53dffc08fb3d39d8b6ff393fcc233429d10232efae42fbde19c9b8081e061c0789dfc
-  data.tar.gz: 269f261bb5d5d787540e21094c3252dff07edface5a0d899bc9c4c67a6bc9dc52fe830bd75023b456f5cf697872f77f8c0149922f939e2c9df8083ca55ffa78e
+  metadata.gz: 0de9a225767de5aeacb5a82629a10df8e8017bd2f49c2514904a9bb59b451d300c554ae990512644b064aa16e24a085989a16aa16a400094b1d8ef3a3c3ff652
+  data.tar.gz: 75d935e07f6957227d87800831efa7e07a5966cb134324798e6f5b37b4780e726f97e094d984ab5f137e002a19475fd167bb8142c5af0b4556ee6152907f7531

data/.gitignore

@@ -22,5 +22,6 @@ tmp
 # RVM
 .rvmrc
 
-# Required to run integration specs
-spec/integration/rmega_account.yml
+# Required to run some specs
+account.yaml
+account.yml

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - 2.2.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.2.1
+
+### New Features
+* \#14 Files and folders can now be renamed with `Node#rename`
+
+### Changes
+* `rmega-dl`, `rmega-up` commands now properly traverse the cloud storage when searching for a file/folder to download/upload
+* `rmega-dl`: fixed scan for Mega links in a webpage
+* The configuration file (~/.rmega) format is changed (from JSON to YAML)
+* Dropped dependency to ActiveSupport
+
 ## 0.2.0
 
 ### New Features

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Daniele Molteni
+Copyright (c) 2015 topac
 
 MIT License
 

data/README.md

@@ -1,27 +1,36 @@
 # Rmega
 
-A ruby library for MEGA ([https://mega.co.nz/](https://mega.co.nz/))  
-Requirements: Ruby 1.9.3+ and OpenSSL 0.9.8r+
+Pure ruby library for <img src="https://mega.co.nz/favicon.ico" alt=""/> **MEGA** [https://mega.nz/](https://mega.nz/).  
+Works on Linux and OSX with Ruby 1.9.3+.
 
+## Installation
 
-This is the result of a reverse engineering of the MEGA javascript code.  
+```
+  gem install rmega
+```
 
+## Command line usage
 
-## Installation
+Since version 0.2.0 you can use the commands `rmega-dl` and `rmega-up` to easily download and upload files to MEGA.
 
-  **Rmega** is distributed via [rubygems.org](https://rubygems.org/).  
-  If you have ruby installed system wide, just type `gem install rmega`.
+ * Downloads are resumable
+ * HTTP proxy support
+ * See the CHANGELOG file for more info
 
-## Usage
+<img src="https://i.imgur.com/VVl55wj.gif"/>
 
-```ruby
-require 'rmega'
-```
+*Pro tips:* 
+
+* Streaming: you can use a video player (e.g. VLC) to play videos while downloading them.
+* Super privacy: you can use it combined with [torsocks](https://github.com/dgoulet/torsocks/) to download and upload files through the Tor network (very slow).
+
+## DSL usage
 
 ### Login
 
 ```ruby
-storage = Rmega.login('your@email.com', 'your_p4ssw0rd')
+require "rmega"
+storage = Rmega.login("your@email.com", "your_password")
 ```
 
 ### Browsing
@@ -139,9 +148,3 @@ end
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-
-## Copyright
-
-Copyright (c) 2013 Daniele Molteni  
-MIT License

data/TODO.md

@@ -1,5 +1,3 @@
 ## TODO
 
   * Add an option to skip mac verification and calculation (upon downloads)
-
-  * Show this gif (https://i.imgur.com/VVl55wj.gif) in the readme?

data/bin/rmega-dl

@@ -14,6 +14,11 @@ end
 OptionParser.new do |opts|
   opts.banner = "Usage:\n"
   opts.banner << "\t#{File.basename(__FILE__)} url [options]\n"
+  opts.banner << "\t#{File.basename(__FILE__)} path [options]\n"
+  opts.banner << "Examples:\n"
+  opts.banner << "\t#{File.basename(__FILE__)} 'https://mega.nz/#!aBkHBKLX!n4kqzbJooqc3o_s96PZjN1tEJzQ4QQwskHf7YqKa'\n"
+  opts.banner << "\t#{File.basename(__FILE__)} https://www.reddit.com/r/megalinks\n"
+  opts.banner << "\t#{File.basename(__FILE__)} /remote/docs/myfile.txt -u email@localhost\n"
   opts.banner << "Options:"
 
   opts.on("-o PATH", "--output", "Local destination path") { |path|
@@ -23,25 +28,26 @@ OptionParser.new do |opts|
   apply_opt_parser_options(opts)
 end.parse!
 
-rescue_errors_and_inerrupt do
-  urls = [cli_options[:url]]
-
-  unless mega_url?(cli_options[:url])
-    urls = scan_mega_urls(Session.new.http_get_content(cli_options[:url])).uniq
-    raise("Nothing to download") if urls.empty?
-  end
-
-  urls.each_with_index do |url, index|
-    node = Rmega::Nodes::Factory.build_from_url(url)
-
-    info = if node.type == :folder
-      stats = node.storage.stats
-      "(#{stats[:files]} file#{'s' if stats[:files] > 1}, #{humanize_bytes(stats[:size])})"
+cli_rescue do
+  if cli_options[:user]
+    session = Rmega::Session.new.login(cli_options[:user], cli_options[:pass] || cli_prompt_password)
+    root = session.storage.root
+    node = traverse_storage(root, cli_options[:url].dup)
+    raise("Node not found - #{cli_options[:url]}") unless node
+    node.download(cli_options[:output] || Dir.pwd)
+  else
+    urls = [cli_options[:url]]
+
+    unless mega_url?(cli_options[:url])
+      html = Rmega::Session.new.http_get_content(cli_options[:url])
+      urls = html.scan(Rmega::Nodes::Factory::URL_REGEXP).flatten.uniq
+      raise("Nothing to download") if urls.empty?
     end
 
-    puts "[#{index+1}/#{urls.count}] #{node.name} #{info}"
-
-    path = cli_options[:output] || Dir.pwd
-    node.download(path)
+    urls.each_with_index do |url, index|
+      node = Rmega::Nodes::Factory.build_from_url(url)
+      print "[#{index+1}/#{urls.size}] " if urls.size > 1
+      node.download(cli_options[:output] || Dir.pwd)
+    end
   end
 end

data/bin/rmega-up

@@ -14,18 +14,28 @@ end
 OptionParser.new do |opts|
   opts.banner = "Usage:\n"
   opts.banner << "\t#{File.basename(__FILE__)} path [options]\n"
+  opts.banner << "Examples:\n"
+  opts.banner << "\t#{File.basename(__FILE__)} /local/file.txt -u email@localhost -r /remote/docs\n"
   opts.banner << "Options:"
 
+  opts.on("-r PATH", "--remote-path", "Remote path") { |path|
+    cli_options[:remote_path] = path
+  }
+
   apply_opt_parser_options(opts)
 end.parse!
 
-rescue_errors_and_inerrupt do
+cli_rescue do
   raise("File not found - #{cli_options[:path]}") unless File.exists?(cli_options[:path])
 
   user = cli_options[:user] || raise("User email is required")
-  pass = cli_options[:pass] ||= cli_prompt_password
+  session = Rmega::Session.new.login(user, cli_options[:pass] ||= cli_prompt_password)
 
-  session = Rmega::Session.new.login(user, pass)
   root = session.storage.root
-  root.upload(cli_options[:path])
+  node = traverse_storage(root, cli_options[:remote_path].to_s.dup, :only_folders => true)
+
+  raise("Node not found - #{cli_options[:remote_path]}") unless node
+  raise("Node cannot be a file - #{cli_options[:remote_path]}") if node.type == :file
+
+  node.upload(cli_options[:path])
 end

data/lib/rmega/cli.rb

@@ -1,12 +1,12 @@
 require 'optparse'
 require 'io/console'
-require 'active_support/core_ext/hash'
+require 'yaml'
 
 module Rmega
   module CLI
     module Helpers
       def cli_options
-        $cli_options ||= {options: {}}
+        $cli_options ||= {}
       end
 
       def cli_prompt_password
@@ -18,10 +18,6 @@ module Rmega
         return password
       end
 
-      def scan_mega_urls(text)
-        text.to_s.scan(Nodes::Factory::URL_REGEXP).flatten.map { |s| "https://mega.co.nz/##{s}" }
-      end
-
       def mega_url?(url)
         Nodes::Factory.url?(url)
       end
@@ -30,46 +26,34 @@ module Rmega
         File.expand_path('~/.rmega')
       end
 
-      def write_configuration_file
-        opts = {options: cli_options[:options]}
-        if cli_options[:user]
-          opts[:user] = cli_options[:user]
-          opts[:pass] = cli_options[:pass] || cli_prompt_password
-        end
-        File.open(configuration_filepath, 'wb') { |file| file.write(opts.to_json) }
-        FileUtils.chmod(0600, configuration_filepath)
-        puts "Options saved into #{configuration_filepath}"
-      end
-
       def read_configuration_file
-        if File.exists?(configuration_filepath)
-          opts = JSON.parse(File.read(configuration_filepath))
-          $cli_options = opts.deep_symbolize_keys.deep_merge(cli_options)
-          puts "Loaded configuration file #{configuration_filepath}" if cli_options[:debug]
-        end
+        return unless File.exists?(configuration_filepath)
+        cli_options = YAML.load_file(configuration_filepath)
+        cli_options.keys.each { |k| cli_options[k.to_sym] = cli_options.delete(k) }
+        puts "Loaded configuration file #{configuration_filepath}" if cli_options[:debug]
       rescue Exception => ex
         raise(ex) if cli_options[:debug]
       end
 
       def apply_cli_options
-        Rmega.logger.level = ::Logger::DEBUG if cli_options[:debug]
-
-        cli_options[:options].each do |key, value|
+        cli_options.each do |key, value|
           Rmega.options.__send__("#{key}=", value)
         end
+        Rmega.logger.level = ::Logger::DEBUG if cli_options[:debug]
+        Rmega.options.show_progress = true
       end
 
       def apply_opt_parser_options(opts)
         opts.on("-t NUM", "--thread_pool_size", "Number of threads to use") { |n|
-          cli_options[:options][:thread_pool_size] = n.to_i
+          cli_options[:thread_pool_size] = n.to_i
         }
 
         opts.on("--proxy-addr ADDRESS", "Http proxy address") { |value|
-          cli_options[:options][:http_proxy_address] = value
+          cli_options[:http_proxy_address] = value
         }
 
         opts.on("--proxy-port PORT", "Http proxy port") { |value|
-          cli_options[:options][:http_proxy_port] = value.to_i
+          cli_options[:http_proxy_port] = value.to_i
         }
 
         opts.on("-u", "--user USER_EMAIL", "User email address") { |value|
@@ -80,10 +64,6 @@ module Rmega
           cli_options[:pass] = value
         }
 
-        opts.on("--write-cfg", "Write a configuration file with the given options") {
-          cli_options[:write_cfg] = true
-        }
-
         opts.on("--debug", "Debug mode") {
           cli_options[:debug] = true
         }
@@ -91,29 +71,44 @@ module Rmega
         opts.on("-v", "--version", "Print the version number") {
           puts Rmega::VERSION
           puts Rmega::HOMEPAGE
-          exit
+          exit!(0)
         }
       end
 
-      def humanize_bytes(*args)
-        Progress.humanize_bytes(*args)
-      end
-
-      def rescue_errors_and_inerrupt(&block)
-        if cli_options[:write_cfg]
-          write_configuration_file
+      def traverse_storage(node, path, opts = {})
+        path.gsub!(/^\/|\/$/, "")
+        curr_part = path.split("/")[0] || ""
+        last_part = (path.split("/")[1..-1] || []).join("/")
+
+        if curr_part.empty?
+          if node.type == :root or node.type == :folder
+            return node
+          else
+            return nil
+          end
         else
-          read_configuration_file
-          apply_cli_options
-          yield
+          n = node.folders.find { |n| n.name.casecmp(curr_part).zero? }
+          n ||= node.files.find { |n| n.name.casecmp(curr_part).zero? } unless opts[:only_folders]
+
+          if last_part.empty?
+            return n
+          else
+            return traverse_storage(n, last_part)
+          end
         end
+      end
+
+      def cli_rescue
+        read_configuration_file
+        apply_cli_options
+        yield
       rescue Interrupt
         puts "\nInterrupted"
       rescue Exception => ex
         if cli_options[:debug]
           raise(ex)
         else
-          puts "\nError: #{ex.message}"
+          $stderr.puts "\nERROR: #{ex.message}"
         end
       end
     end

data/lib/rmega/loggable.rb

@@ -8,7 +8,9 @@ module Rmega
   end
 
   module Loggable
-    extend ActiveSupport::Concern
+    def self.included(base)
+      base.__send__(:extend, ClassMethods)
+    end
 
     def logger
       Rmega.logger

data/lib/rmega/nodes/downloadable.rb

@@ -69,7 +69,7 @@ module Rmega
         path = ::File.expand_path(path)
         path = Dir.exists?(path) ? ::File.join(path, name) : path
 
-        progress = Progress.new(filesize, caption: 'Download')
+        progress = Progress.new(filesize, caption: 'Download', filename: self.name)
         pool = Pool.new
 
         @resumed_download = allocated?(path)

data/lib/rmega/nodes/expandable.rb

@@ -7,15 +7,13 @@ module Rmega
         node_key = NodeKey.random
 
         # encrypt attributes
-        attributes_str = "MEGA"
-        attributes_str << {n: name.strip}.to_json
-        attributes_str << ("\x00" * (16 - (attributes_str.size % 16)))
-        encrypted_attributes = aes_cbc_encrypt(node_key.aes_key, attributes_str)
+        _attr = serialize_attributes(:n => name.strip)
+        _attr = aes_cbc_encrypt(node_key.aes_key, _attr)
 
         # Encrypt node key
         encrypted_key = aes_ecb_encrypt(session.master_key, node_key.aes_key)
 
-        n = [{h: 'xxxxxxxx', t: 1, a: Utils.base64urlencode(encrypted_attributes), k: Utils.base64urlencode(encrypted_key)}]
+        n = [{h: 'xxxxxxxx', t: 1, a: Utils.base64urlencode(_attr), k: Utils.base64urlencode(encrypted_key)}]
         data = session.request(a: 'p', t: handle, n: n)
         return Folder.new(session, data['f'][0])
       end

data/lib/rmega/nodes/factory.rb

@@ -16,9 +16,9 @@ module Rmega
     module Factory
       extend self
 
-      URL_REGEXP = /mega\..+\/\#([A-Z0-9\_\-\!\=]+)/i
+      URL_REGEXP = /(http.:\/\/[w\.]*mega\.[a-z\.]+\/\#[A-Z0-9\_\-\!\=]+)/i
 
-      FOLDER_URL_REGEXP = /mega\..+\/\#\F([A-Z0-9\_\-\!\=]+)/i
+      FOLDER_URL_REGEXP = /\#\F/
 
       def url?(string)
         string.to_s =~ URL_REGEXP

data/lib/rmega/nodes/node.rb

@@ -8,7 +8,10 @@ module Rmega
 
       attr_reader :data, :session
 
-      delegate :request, :shared_keys, :rsa_privk, :master_key, :storage, :to => :session
+      # Delegate to :session
+      [:request, :shared_keys, :rsa_privk, :master_key, :storage].each do |name|
+        __send__(:define_method, name) { |*args| session.__send__(name, *args) }
+      end
 
       TYPES = {0 => :file, 1 => :folder, 2 => :root, 3 => :inbox, 4 => :trash}
 
@@ -25,6 +28,30 @@ module Rmega
         @public_handle ||= request(a: 'l', n: handle)
       end
 
+      def serialize_attributes(hash)
+        str = "MEGA"
+        str << hash.to_json
+        str << ("\x00" * (16 - (str.size % 16)))
+        return str
+      end
+
+      def rename(new_name)
+        node_key = NodeKey.load(decrypted_file_key)
+
+        _attr = serialize_attributes(attributes.merge("n" => new_name))
+        _attr = aes_cbc_encrypt(node_key.aes_key, _attr)
+        _attr = Utils.base64urlencode(_attr)
+
+        resp = request(:a => "a", :attr => _attr, :key => Utils.base64urlencode(node_key.aes_key), :n => handle)
+
+        if resp != 0
+          raise("Rename failed")
+        else
+          @data['a'] = _attr
+          return self
+        end
+      end
+
       def handle
         data['h']
       end
@@ -122,7 +149,10 @@ module Rmega
         encrypted = Utils.base64urldecode(encrypted)
         encrypted.strip! if encrypted.size % 16 != 0 # Fix possible errors
         json = aes_cbc_decrypt(node_key.aes_key, encrypted)
-        JSON.parse json.gsub(/^MEGA/, '').rstrip
+        # Remove invalid bytes at the end of the string
+        json.strip!
+        json.gsub!(/^MEGA\{(.+)\}.*/, '{\1}')
+        return JSON.parse(json)
       end
 
       def type

data/lib/rmega/nodes/root.rb

@@ -3,6 +3,12 @@ module Rmega
     class Root < Node
       include Expandable
       include Traversable
+
+      def download(path)
+        children.each do |node|
+          node.download(path)
+        end
+      end
     end
   end
 end

data/lib/rmega/nodes/uploadable.rb

@@ -46,7 +46,7 @@ module Rmega
         pool = Pool.new
         read_mutex = Mutex.new
 
-        progress = Progress.new(filesize, caption: 'Upload')
+        progress = Progress.new(filesize, caption: 'Upload', filename: ::File.basename(path))
 
         chunk_macs = {}
 
@@ -69,10 +69,8 @@ module Rmega
         pool.shutdown
 
         # encrypt attributes
-        attributes_str = "MEGA"
-        attributes_str << {n: ::File.basename(path)}.to_json
-        attributes_str << ("\x00" * (16 - (attributes_str.size % 16)))
-        encrypted_attributes = aes_cbc_encrypt(rnd_node_key.aes_key, attributes_str)
+        _attr = serialize_attributes(:n => ::File.basename(path))
+        _attr = aes_cbc_encrypt(rnd_node_key.aes_key, _attr)
 
         # Calculate meta_mac
         file_mac = aes_cbc_mac(rnd_node_key.aes_key, chunk_macs.sort.map(&:last).join, "\x0"*16)
@@ -80,7 +78,7 @@ module Rmega
         encrypted_key = aes_ecb_encrypt(session.master_key, rnd_node_key.generate)
 
         resp = request(a: 'p', t: handle, n: [
-          {h: file_handle, t: 0, a: Utils.base64urlencode(encrypted_attributes), k: Utils.base64urlencode(encrypted_key)}
+          {h: file_handle, t: 0, a: Utils.base64urlencode(_attr), k: Utils.base64urlencode(encrypted_key)}
         ])
 
         return Nodes::Factory.build(session, resp['f'][0])

data/lib/rmega/options.rb

@@ -8,7 +8,7 @@ module Rmega
       http_read_timeout:    180,
       # http_proxy_address:   '127.0.0.1',
       # http_proxy_port:      8080,
-      show_progress:        true,
+      show_progress:        false,
       file_integrity_check: true,
       api_url:              'https://eu.api.mega.co.nz/cs'
     }
@@ -19,7 +19,9 @@ module Rmega
   end
 
   module Options
-    extend ActiveSupport::Concern
+    def self.included(base)
+      base.__send__(:extend, ClassMethods)
+    end
 
     def options
       Rmega.options

data/lib/rmega/progress.rb

@@ -10,6 +10,10 @@ module Rmega
       @mutex = Mutex.new
       @start_time = Time.now
 
+      if show? and options[:filename]
+        puts options[:filename]
+      end
+
       show
     end
 

data/lib/rmega/storage.rb

@@ -6,7 +6,10 @@ module Rmega
 
     attr_reader :session
 
-    delegate :master_key, :shared_keys, to: :session
+    # Delegate to :session
+    [:master_key, :shared_keys].each do |name|
+      __send__(:define_method, name) { |*args| session.__send__(name, *args) }
+    end
 
     def initialize(session)
       @session = session

data/lib/rmega/version.rb

@@ -1,4 +1,4 @@
 module Rmega
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   HOMEPAGE = "https://github.com/topac/rmega"
 end

data/lib/rmega.rb

@@ -6,10 +6,12 @@ require 'net/http'
 require 'base64'
 require 'openssl'
 require 'digest/md5'
+require 'json'
 
-require 'active_support/json'
-require 'active_support/concern'
-require 'active_support/core_ext/module/delegation'
+# Used only in specs
+require 'yaml'
+require 'tmpdir'
+require 'fileutils'
 
 require 'rmega/version'
 require 'rmega/loggable'
@@ -26,11 +28,6 @@ require 'rmega/session'
 require 'rmega/storage'
 require 'rmega/nodes/factory'
 
-# Used only in specs
-require 'yaml'
-require 'tmpdir'
-require 'fileutils'
-
 module Rmega
   def self.login(email, password)
     Session.new.login(email, password).storage

data/rmega.gemspec

@@ -20,6 +20,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
-
-  gem.add_dependency "activesupport"
 end

data/spec/integration/file_download_spec.rb

@@ -4,7 +4,7 @@ describe 'File download' do
 
   context 'given a public mega url (a small file)' do
 
-    let(:url) { 'https://mega.co.nz/#!MAkg2Iab!bc9Y2U6d93IlRRKVYpcC9hLZjS4G278OPdH6nTFPDNQ' }
+    let(:url) { 'https://mega.nz/#!QQhADCbL!vUY_phwxvkC004t5NKx7vynL16SvFfHYFkiX5vUlgjQ' }
 
     it 'downloads the related file' do
       Rmega.download(url, temp_folder)
@@ -15,7 +15,7 @@ describe 'File download' do
 
   context 'given a public mega url (a big file)' do
 
-    let(:url) { 'https://mega.co.nz/#!NYVkDaLD!BKyN5SRpOaEtGnTcwiAqcxmJc7p-k0IPWKAW-471KRE' }
+    let(:url) { 'https://mega.nz/#!oAhCnBKR!CPeG8X92nBjvFsBF9EprZNW_TqIUwItHMkF9G2IZEIo' }
 
     it 'downloads the related file' do
       Rmega.download(url, temp_folder)

data/spec/integration/file_integrity_spec.rb

@@ -1,39 +1,46 @@
 require 'integration_spec_helper'
 
-describe 'File integrity over upload/download operations' do
+describe 'File integrity' do
 
-  if account_file_exists?
+  if account?
 
     before(:all) do
       @storage = login
     end
 
-    let(:name) { "test_file" }
+    context "when a file is renamed" do
 
-    let(:path) { File.join(temp_folder, name)}
+      let(:path) { "#{temp_folder}/testfile_#{SecureRandom.hex(6)}" }
 
-    [12, 1_024_000].each do |size|
+      let(:new_name) { "testfile_#{SecureRandom.hex(6)}" }
+
+      it 'it does not get corrupted' do
+        File.write(path, SecureRandom.hex(24))
+        file = @storage.root.upload(path)
+        file.rename(new_name)
+        expect(file.name).to eq(new_name)
+        file = @storage.nodes.find { |n| n.handle == file.handle }
+        file.delete
+        expect(file.name).to eq(new_name)
+      end
+    end
+
+    [12, 6_000].each do |size|
 
       context "when a file (#{size} bytes) is uploaded and then downloaded" do
 
-        let(:content) { OpenSSL::Random.random_bytes(size) }
+        let(:path) { "#{temp_folder}/testfile_#{SecureRandom.hex(6)}" }
 
-        let(:content_hash) { Digest::MD5.hexdigest(content) }
+        let(:content) { SecureRandom.random_bytes(size) }
 
-        before do
-          File.open(path, 'wb') { |f| f.write(content) }
-          file = @storage.root.upload(path)
-          @file = @storage.nodes.find { |n| n.handle == file.handle }
-          expect(@file.name).to eq(name)
-          @file.download(path+".downloaded")
-        end
+        let(:content_hash) { Digest::MD5.hexdigest(content) }
 
         it 'it does not get corrupted' do
-          expect(Digest::MD5.file(path+".downloaded").hexdigest).to eq(content_hash)
-        end
-
-        after do
-          @file.delete if @file
+          File.write(path, content)
+          file = @storage.root.upload(path)
+          file.download("#{path}.downloaded")
+          file.delete
+          expect(Digest::MD5.file("#{path}.downloaded").hexdigest).to eq(content_hash)
         end
       end
     end

data/spec/integration/file_upload_spec.rb

@@ -2,29 +2,26 @@ require 'integration_spec_helper'
 
 describe 'File upload' do
 
-  if account_file_exists?
+  if account?
 
-    before(:all) { @storage = login }
-
-    let(:name) { "test_file" }
+    before(:all) do
+      @storage = login
+    end
 
-    let(:path) { File.join(temp_folder, name)}
+    [12, 6_000].each do |size|
 
-    [12, 1_024_000].each do |size|
       context "when a file (#{size} bytes) is uploaded" do
 
-        before do
-          File.open(path, 'wb') { |f| f.write(OpenSSL::Random.random_bytes(size)) }
-          @file = @storage.root.upload(path)
-        end
+        let(:path) { "#{temp_folder}/testfile_#{SecureRandom.hex(6)}" }
 
-        it 'it can be found as a file node' do
-          found_node = @storage.root.files.find { |f| f.handle == @file.handle }
-          expect(found_node).not_to be_nil
-        end
+        let(:content) { SecureRandom.random_bytes(size) }
 
-        after do
-          @file.delete if @file
+        it 'is found' do
+          File.write(path, content)
+          file = @storage.root.upload(path)
+          file = @storage.root.files.find { |f| f.handle == file.handle }
+          file.delete
+          expect(file).not_to be_nil
         end
       end
     end

data/spec/integration/folder_download_spec.rb

@@ -4,7 +4,7 @@ describe 'Folder download' do
 
   context 'given a public mega url (folder)' do
 
-    let(:url) { 'https://mega.co.nz/#F!IYERlQqa!pvqkX7UUsRGKBs3FWKXzUQ' }
+    let(:url) { 'https://mega.nz/#F!oQYEUaBD!QtYCjQDbBzefFeIM994FIg' }
 
     it 'downloads the related file' do
       Rmega.download(url, temp_folder)

data/spec/integration/folder_operations_spec.rb

@@ -2,16 +2,16 @@ require 'integration_spec_helper'
 
 describe 'Folders operations' do
 
-  if account_file_exists?
+  if account?
 
     before(:all) do
       @storage = login
     end
 
-    let(:name) { "test_folder" }
-
     context 'when #create_folder is called on a node' do
 
+      let(:name) { "testfolder_#{SecureRandom.hex(5)}" }
+
       before do
         @folder = @storage.root.create_folder(name)
       end
@@ -27,6 +27,9 @@ describe 'Folders operations' do
     end
 
     context 'searching for a folder by its handle' do
+
+      let(:name) { "testfolder_#{SecureRandom.hex(5)}" }
+
       before do
         @folder = @storage.root.create_folder(name)
       end
@@ -42,6 +45,9 @@ describe 'Folders operations' do
     end
 
     context 'when #create_folder under created folder' do
+
+      let(:name) { "testfolder_#{SecureRandom.hex(5)}" }
+
       before do
         @folder = @storage.root.create_folder(name)
         @sub_folder = @folder.create_folder(name)

data/spec/integration/login_spec.rb

@@ -2,7 +2,7 @@ require 'integration_spec_helper'
 
 describe 'Login' do
 
-  if account_file_exists?
+  if account?
 
     context 'when email and password are correct' do
       it 'does not raise erorrs' do

data/spec/integration/resume_download_spec.rb

@@ -3,7 +3,7 @@ require 'integration_spec_helper'
 module Rmega
   describe 'Resumable download' do
 
-    let(:download_url) { 'https://mega.co.nz/#!NYVkDaLD!BKyN5SRpOaEtGnTcwiAqcxmJc7p-k0IPWKAW-471KRE' }
+    let(:download_url) { 'https://mega.nz/#!oAhCnBKR!CPeG8X92nBjvFsBF9EprZNW_TqIUwItHMkF9G2IZEIo' }
 
     let(:destination_file) { "#{temp_folder}/temp.txt" }
 
@@ -25,26 +25,14 @@ module Rmega
         node.file_io_synchronize { content = File.read(destination_file) }
         content.strip!
         break if content.size > 5_000_000
-        sleep(1)
+        sleep(0.5)
       end
 
       thread.kill
-      sleep(1)
 
-      thread = Thread.new do
-        node.download(destination_file)
-      end
-
-      loop do
-        # todo: i saw this failing becausa destination_file was missing :/
-        node.file_io_synchronize { content = File.read(destination_file) }
-        content.strip!
-        expect(content.size).to be > 5_000_000
-        break if content.size >= 15_728_640
-        sleep(1)
-      end
+      sleep(2)
 
-      thread.join
+      node.download(destination_file)
 
       md5 = Digest::MD5.file(destination_file).hexdigest
       expect(md5).to eq("0451dc82ac003dbef703342e40a1b8f6")

data/spec/integration/rmega-dl_spec.rb

@@ -0,0 +1,35 @@
+require 'integration_spec_helper'
+
+describe "rmega-dl" do
+
+  let(:url) { 'https://mega.nz/#!QQhADCbL!vUY_phwxvkC004t5NKx7vynL16SvFfHYFkiX5vUlgjQ' }
+
+  def call(*args)
+    `bundle exec ./bin/rmega-dl #{args.join(' ')}`
+  end
+
+  context "without args" do
+
+    it "shows the help" do
+      expect(call).to match(/usage/i)
+    end
+  end
+
+  context "given a public link" do
+    it "downloads a file" do
+      call("'#{url}' -o #{temp_folder}")
+      downloaded_file = "#{temp_folder}/testfile.txt"
+      expect(File.read(downloaded_file)).to eq "helloworld!\n"
+    end
+  end
+
+  if account?
+    context "given an account and a path" do
+      it "downloads a file" do
+        call("/test_folder/a.txt -u #{account['email']} --pass #{account['password']} -o #{temp_folder}")
+        downloaded_file = "#{temp_folder}/a.txt"
+        expect(File.read(downloaded_file)).to eq "hello\n"
+      end
+    end
+  end
+end

data/spec/integration/rmega-up_spec.rb

@@ -0,0 +1,67 @@
+require 'integration_spec_helper'
+require 'open3'
+
+describe "rmega-up" do
+  def call(*args)
+    Open3.capture2e("bundle exec ./bin/rmega-up #{args.join(' ')}").join("\n")
+  end
+
+  let(:file_content) { SecureRandom.hex(10) }
+
+  let(:filename) { "testfile_"+SecureRandom.hex(5)+".txt" }
+
+  let(:filepath) { "#{temp_folder}/#{filename}" }
+
+  before do
+    File.write(filepath, file_content)
+  end
+
+  context "without args" do
+
+    it "shows the help" do
+      expect(call).to match(/usage/i)
+    end
+  end
+
+  context "without username" do
+    it "fails" do
+      expect(call(filepath)).to match(/require/i)
+    end
+  end
+
+  context "when the local file is missing" do
+    it "fails" do
+      expect(call("foobar.txt")).to match(/missing|not found/i)
+    end
+  end
+
+  if account?
+    context "when the remote path is missing" do
+      it "fails" do
+        resp = call("#{filepath} -u #{account['email']} --pass #{account['password']} -r /foobar")
+        expect(resp).to match(/error/i)
+      end
+    end
+
+    context "without specifying a remote folder" do
+      it "uploads a file to the root node" do
+        call("#{filepath} -u #{account['email']} --pass #{account['password']}")
+        storage = login
+        node = storage.root.files.find { |f| f.name == filename }
+        node.delete if node
+        expect(node).not_to be_nil
+      end
+    end
+
+    context "when specifying a remote folder" do
+      it "uploads a file into that folder" do
+        call("#{filepath} -u #{account['email']} --pass #{account['password']} -r test_folder2")
+        storage = login
+        node = storage.root.folders.find { |f| f.name == "test_folder2" }
+        node = node.files.find { |f| f.name == filename }
+        node.delete if node
+        expect(node).not_to be_nil
+      end
+    end
+  end
+end

data/spec/integration_spec_helper.rb

@@ -1,15 +1,21 @@
 require 'spec_helper'
 
 def account_file_path
-  File.join File.dirname(__FILE__), 'integration/rmega_account.yml'
+  File.join(File.dirname(__FILE__), "account.yaml")
 end
 
-def account_file_exists?
-  File.exists? account_file_path
+def account?
+  account
 end
 
 def account
-  @account ||= YAML.load_file account_file_path
+  if ENV["MEGA_EMAIL"] and ENV["MEGA_PASSWORD"]
+    {'email' => ENV["MEGA_EMAIL"], 'password' => ENV["MEGA_PASSWORD"]}
+  elsif File.exists?(account_file_path)
+    YAML.load_file(account_file_path)
+  else
+    nil
+  end
 end
 
 def login
@@ -22,7 +28,6 @@ end
 
 RSpec.configure do |config|
   config.before(:all) do
-    Rmega.options.show_progress = false
     FileUtils.mkdir_p(temp_folder)
   end
 

metadata

@@ -1,69 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rmega
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - topac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: mega.co.nz ruby api
@@ -75,8 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -125,7 +111,8 @@ files:
 - spec/integration/folder_operations_spec.rb
 - spec/integration/login_spec.rb
 - spec/integration/resume_download_spec.rb
-- spec/integration/rmega_account.yml.example
+- spec/integration/rmega-dl_spec.rb
+- spec/integration/rmega-up_spec.rb
 - spec/integration_spec_helper.rb
 - spec/rmega/lib/cli_spec.rb
 - spec/rmega/lib/session_spec.rb
@@ -142,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: mega.co.nz ruby api
@@ -164,7 +151,8 @@ test_files:
 - spec/integration/folder_operations_spec.rb
 - spec/integration/login_spec.rb
 - spec/integration/resume_download_spec.rb
-- spec/integration/rmega_account.yml.example
+- spec/integration/rmega-dl_spec.rb
+- spec/integration/rmega-up_spec.rb
 - spec/integration_spec_helper.rb
 - spec/rmega/lib/cli_spec.rb
 - spec/rmega/lib/session_spec.rb

data/spec/integration/rmega_account.yml.example

@@ -1,2 +0,0 @@
-email: insert_email_here
-password: insert_pass_here