BtSync 0.5.3 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhjNjEyZWExZmE5ZjY5Mzg0ZGY0N2EzNDY2M2E0Yjc0OWMzNGRmMg==
+    Yzk2ZWQ3OTY5NDA5NzVhMDgxOWY3NWU3NDVjNmMwZDE5OWE4NzRiOA==
   data.tar.gz: !binary |-
-    MzBiMGJiMTlhYmM4N2ZlZmYyNmE1ZjU3NThiZmRiYjRjNzU3NDU4MA==
+    OGUzNjQyNmM5OGJlMDc0N2NhNjQ3MmY2YzI4OTNmN2M1YTE5YzQ2Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjRhZDhhZWQzMGQ1MGRkMDgwNDAyMThiYzc4NGJiMDYwNzdmZDY0ZGJjOTdj
-    NWU1NWM3NTVhYzI3N2IzNmVjODhkZGRmNzMyMWI1MzU3ZjA0MTU3MDc3ZWFh
-    ZjdhNDdlZGU2YjFjOWJkYzE2MDA3ODhkMGQxYmE3YzAzMDkwZTk=
+    MWNhNzgzZTJlYjZkYmMwMjEwZjk1OWExZjg0NTc1MDE0Y2MwYjM4ZjJkN2Mx
+    NDVmNjE5ZWUxMTEyZWQ3MTk2YjkyNWYyNGYxYTI4YWNhZGQ2NzRkMzU1ZmFj
+    YzRhYWI1YzNiYzFhMmUwMDBiZjJjZWRiZmI3YzAwOWFlZGQyZTY=
   data.tar.gz: !binary |-
-    YTRhZjQ1OTVhZjhkYjQ4YWRlOTVhMDY2NjlmN2FhMTg2YTUwOWFjNGIzNTJh
-    ODlmNzA3MmJhMGFlOGFlZWVkNmQ1NzEzM2U4NzAxOGU4NmJjNDdiMDlhNmMx
-    NTQxNTEyY2ZlOGFiY2RhMzllMjAwOTRmNmI4ZTQwZGU4MTk2ZjQ=
+    NTA5NTdmNDg0M2QwYTZjNTYyNjMxMWMzNmJkZGY0MzNlMDFlZGU1N2M4ZWEz
+    ZDM4ZjRhNzA0ZTI4Y2VmM2M3MDY5ODA1YWZiOTU4MGZkMDA3YzU1NmM2YjFj
+    ZjUxZDllZTE0ZGJlZTcwNDNjNDcxYWQ5ODAwY2E3YmFiODcxMDg=

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  Excludes:
+    - cookbooks/**

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
 # uncomment this line if your project needs to run something other than `rake`:
-script: bundle exec rspec spec
+script:
+  - bundle exec rspec spec
 notifications:
   email: false

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/ChrisMacNaughton/BtSync.png?branch=master)](https://travis-ci.org/ChrisMacNaughton/BtSync)
 [![Code Climate](https://codeclimate.com/github/ChrisMacNaughton/BtSync.png)](https://codeclimate.com/github/ChrisMacNaughton/BtSync)
+[![Coverage Status](https://coveralls.io/repos/ChrisMacNaughton/BtSync/badge.png)](https://coveralls.io/r/ChrisMacNaughton/BtSync)
 
 BtSync is a library to help you interact with Bittorrent Sync in Ruby
 

data/btsync.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "vcr"
+  spec.add_development_dependency "coveralls"
 
   spec.add_runtime_dependency "httparty"
   spec.add_runtime_dependency "json"

data/lib/btsync.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'httparty'
 lib = File.expand_path('../btsync', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -8,80 +9,96 @@ require 'directory'
 class BtSync
   include BtCommunicator
   include HTTParty
-  default_params :output => 'json'
-  def initialize options = {}
-    @opts = {
-      :protocol => "http",
-      :uri => "localhost",
-      :port => "8888",
-      :user => "admin",
-      :password => "AdminPassword"}
-    @opts.merge!(options.symbolize)
-    @opts[:uri].gsub!(/^(https?:\/\/){1,}/i, '')
-    @port =  @opts[:port]
-    @user = @opts[:user]
-    @pass = @opts[:password]
+  default_params output: 'json'
+  def initialize(options = {})
+    @opts = setup_opts(options)
     @errors = []
     @token_cache = 0
   end
+
   def errors
     errors = @errors
     @errors = []
     errors
   end
+
   def folders
-    f = get_folder_list["folders"]
+    f = get_folder_list['folders']
     folders = []
     f.each do |folder|
-      folders << Directory.new(folder["name"], folder["secret"], self)
+      folders << Directory.new(folder['name'], folder['secret'], self)
     end
     folders
   end
+
   def upload_limit
-    get_settings["ulrate"].to_i
+    get_settings['ulrate'].to_i
   end
+
   def download_limit
-    get_settings["dlrate"].to_i
+    get_settings['dlrate'].to_i
   end
+
   def device_name
-    get_settings["devicename"]
+    get_settings['devicename']
   end
+
   def listening_port
-    get_settings["listeningport"].to_i
+    get_settings['listeningport'].to_i
   end
-  def upload_limit= opt
-    change_setting "ulrate", opt
+
+  def upload_limit=(opt)
+    change_setting 'ulrate', opt
   end
-  def download_limit= opt
-    change_setting "dlrate", opt
+
+  def download_limit=(opt)
+    change_setting 'dlrate', opt
   end
-  def device_name= opt
-    change_setting "devicename", opt
+
+  def device_name=(opt)
+    change_setting 'devicename', opt
   end
-  def listening_port= opt
-    change_setting "listeningport", opt
+
+  def listening_port=(opt)
+    change_setting 'listeningport', opt
   end
-  def change_setting type, opt
-    options = get_settings.merge!({type => opt})
 
-    res = get(path('setsettings'), :query => options)
+  def change_setting(type, opt)
+    options = get_settings.merge!({ type => opt })
+
+    get(path('setsettings'), query: options)
   end
+
   def get_speed
-    s = get_folder_list["speed"].split(", ")
-    up = s[0].split(" ")
-    down = s[1].split(" ")
-    {:up => {:speed => up[0], :metric => up[1]}, :down => {:speed => down[0], :metric => down[1]}}
+    {
+      up: up,
+      down: down
+    }
+  end
+
+  def up
+    l = get_folder_list['speed'].split(', ')[0].split(' ')
+    {speed: l[0].to_f, metric: l[1]}
+  end
+
+  def down
+    l = get_folder_list['speed'].split(', ')[1].split(' ')
+    {speed: l[0].to_f, metric: l[1]}
   end
-  def remove_folder folder_name, my_secret = nil
+
+  def remove_folder(folder_name, my_secret = nil)
     my_secret ||= secret(folder_name)
-    res = get(path('removefolder'), :query => { :name => folder_name, :secret => my_secret})
+    query = { name: folder_name, secret: my_secret }
+    get(path('removefolder'), query: query)
     true
   end
-  def add_folder folder_name, my_secret = nil
+
+  def add_folder(folder_name, my_secret = nil)
     my_secret ||= generate_secret
-    res = get(path('addsyncfolder'), :query => { :name => folder_name, :secret => my_secret})
-    unless res["error"] == 0
-      @errors << res["message"]
+    query = { name: folder_name, secret: my_secret }
+    res = get(path('addsyncfolder'), query: query)
+    unless res['error'] == 0
+      @errors << res['message']
       return false
     end
     Directory.new(folder_name, my_secret, self)
@@ -89,32 +106,55 @@ class BtSync
 
   def get_settings
     res = get(path('getsettings'))
-    res.parsed_response["settings"]
+    res.parsed_response['settings']
   end
+
   def get_os_type
     res = get(path('getostype'))
-    res.parsed_response["os"]
+    res.parsed_response['os']
   end
+
   def get_version
     res = get(path('getversion'))
-    res.parsed_response["version"]
+    res.parsed_response['version']
   end
+
   def check_new_version
     res = get(path('checknewversion'))
-    res.parsed_response["version"]
+    res.parsed_response['version']
   end
 
-  def get_dir with_dir = "/"
-    res = get(path('getdir'), :query => {"dir" => with_dir})
-    res.parsed_response["folders"].map{|f| f.gsub!('//', '/')}
+  def get_dir(with_dir = '/')
+    res = get(path('getdir'), query: { 'dir' => with_dir })
+    res.parsed_response['folders'].map { |f| f.gsub!('//', '/') }
   end
 
-  def secret with_dir
-    f = folders.select{|folder| folder.name == with_dir}.first
+  def secret(with_dir)
+    f = folders.select { |folder| folder.name == with_dir }.first
     f.secret
   end
+
   private
 
+  def setup_opts(opts)
+    opt = defaults.merge!(opts.symbolize)
+    opt[:uri].gsub!(%r(^(https?://){1,})i, '')
+    @port =  opt[:port]
+    @user = opt[:user]
+    @pass = opt[:password]
+    opt
+  end
+
+  def defaults
+    {
+      protocol: 'http',
+      uri: 'localhost',
+      port: '8888',
+      user: 'admin',
+      password: 'AdminPassword'
+    }
+  end
+
   def get_folder_list
     res = get(path('getsyncfolders'))
     @folder_list = res.parsed_response
@@ -123,7 +163,7 @@ end
 class Hash
   def symbolize
     r = {}
-    self.each do |k,v|
+    self.each do |k, v|
       if k.is_a? String
         r[k.to_symbol] = v
       else

data/lib/btsync/communicator.rb

@@ -1,68 +1,89 @@
+# encoding: utf-8
 module BtCommunicator
   include HTTParty
+  attr_reader :opts
   disable_rails_query_string_format
-  default_params :output => 'json'
+  default_params output: 'json'
   def generate_secret
     res = get(path('generatesecret'))
-    res.parsed_response["secret"]
+    res.parsed_response['secret']
   end
+
   def port
     @opts[:port]
   end
+
   def uri
     @opts[:uri]
   end
+
   def protocol
     @opts[:protocol]
   end
+
   def user
     @opts[:user]
   end
+
   def password
     @opts[:password]
   end
-  def communication_options
-    @opts
-  end
+
   def auth
-    {:username => user, :password => password}
+    { username: user, password: password }
   end
-  def token force = false
+
+  def token(force = false)
     @token_cache ||= 0
-    time = DateTime.now.strftime("%s").to_i
+    time = DateTime.now.strftime('%s').to_i
     if time > @token_cache + 600 || force
-      @token = request_token(force).gsub('</div></html>', '').gsub("<html><div id='token' style='display:none;'>", '')
+      @token = request_token(force).
+        gsub('</div></html>', '').
+        gsub("<html><div id='token' style='display:none;'>", '')
       @token_cache = time
     end
     @cookies = nil if force
     @token
   end
+
   def cookies
-    @cookies ||= request_token.headers["set-cookie"].split("; ")[0]
+    @cookies ||= request_token.headers['set-cookie'].split('; ')[0]
   end
+
   def root_url
     "#{starter}#{uri}:#{port}/"
   end
 
-  def get path, opts = {}
-    opts = {:headers=>{"Cookie" => cookies}, :query => {}, :basic_auth => auth}.merge(opts)
+  def get(path, opts = {})
+    opts = {
+      headers: {
+        'Cookie' => cookies
+      }, query: {
+
+      }, basic_auth: auth }.merge(opts)
     self.class.get(path, opts)
   end
 
-  def request_token force = false
+  def request_token(force = false)
     @last_request ||= 0
     t = DateTime.now.strftime('%s').to_i
     if @request_token.nil? || force || (@last_request + 600) < t
       @last_request = t
-      @request_token = self.class.get("#{root_url}gui/token.html", :basic_auth => auth)
+      @request_token = self.class.get(token_path, basic_auth: auth)
     else
       @request_token
     end
   end
+
+  def token_path
+    "#{root_url}gui/token.html"
+  end
+
   def starter
     "#{protocol}://"
   end
-  def path action_name
+
+  def path(action_name)
     "#{root_url}gui/?token=#{token}&action=#{action_name}"
   end
 end

data/lib/btsync/directory.rb

@@ -1,15 +1,16 @@
+# encoding: utf-8
 class BtSync
   class Directory
     include HTTParty
     include BtCommunicator
-    default_params :output => 'json'
-    attr_reader :secret, :name
+    default_params output: 'json'
+    attr_reader :secret, :name, :errors
 
-    def initialize name, secret, btsync
+    def initialize(name, secret, btsync)
       @name = name
       @secret = secret
 
-      @opts = btsync.communication_options
+      @opts = btsync.opts
 
       find_or_create
 
@@ -17,105 +18,149 @@ class BtSync
     end
 
     def destroy
-      get(path('removefolder'), :query => { :name => name, :secret => secret} )
-      self.instance_variables.each{|v| v = nil}
+      get(path('removefolder'), query: { name: name, secret: secret })
+      self.instance_variables.each { |v| v = nil }
     end
-    def update_secret new_secret = nil
-      new_secret ||= generate_secret
-      res = get(path('updatesecret'), :query => { :name => @name, :secret =>  @secret, :newsecret => new_secret} )
-      if res.parsed_response != "{}" && res.parsed_response != '\r\ninvalid request'
+
+    def update_secret(new_secret = generate_secret)
+      query = secret_params(new_secret)
+      res = get(path('updatesecret'), query: query)
+      p = res.parsed_response
+      if p != {} && p != '\r\ninvalid request'
         @secret = new_secret
         true
       else
-        @errors << res.parsed_response
+        if p == {}
+          @errors << "Invalid Secret"
+        else
+          @errors << res.parsed_response
+        end
         false
       end
     end
+
     def folders
-      res = get(path('getdir'), :query => {:dir => @name})
-      res.parsed_response["folders"]
+      res = get(path('getdir'), query: { dir: @name })
+      res.parsed_response['folders']
     end
+
     def peers
-      res = get(path('getsyncfolders') )
-      f = res.parsed_response["folders"].select{|f| f["name"] == name}.first
-      f["peers"]
+      res = get(path('getsyncfolders'))
+      r = res.parsed_response['folders'].select { |f| f['name'] == name }.first
+      r['peers']
     end
+
     def known_hosts
-      res = get(path('getknownhosts'), :query => {:name => name, :secret => secret})
+      query = { name: name, secret: secret }
+      res = get(path('getknownhosts'), query: query)
       hosts = {}
-      res["hosts"].map{|h| hosts[h["index"]] = h["peer"]}
+      res['hosts'].map { |h| hosts[h['index']] = h['peer'] }
       hosts
     end
-    def add_host host, port
-      res = get(path('addknownhosts'), :query =>{:name => name, :secret => secret, :addr =>host, :port => port} )
+
+    def add_host(host, port)
+      query = { name: name, secret: secret, addr: host, port: port }
+      get(path('addknownhosts'), query: query)
       true
     end
-    def remove_host index
-      res = get(path('removeknownhosts'), :query =>{:name => name, :secret => secret, :index => index} )
+
+    def remove_host(index)
+      query = { name: name, secret: secret, index: index }
+      res = get(path('removeknownhosts'), query: query)
       if res.parsed_response != {}
         res.parsed_response
       else
         true
       end
     end
-    def remove_host_by_ip ip, port = nil
-      @hosts = known_hosts
+
+    def remove_host_by_ip(ip, port = nil)
+      known_hosts.each do |id, host|
+        host = host.split(':')
+        if ip == host[0]
+          next if port != host[1] unless port.nil?
+
+          remove_host(id)
+        end
+      end
     end
+
     def use_tracker=(opt)
       set_pref('usetracker', opt)
     end
+
     def use_tracker?
-      bool(preferences["usetracker"])
+      bool(preferences['usetracker'])
     end
+
     def use_hosts=(opt)
       set_pref('usehosts', opt)
     end
+
     def use_hosts?
-      bool(preferences["usehosts"])
+      bool(preferences['usehosts'])
     end
+
     def search_lan=(opt)
       set_pref('searchlan', opt)
     end
+
     def search_lan?
-      bool(preferences["searchlan"])
+      bool(preferences['searchlan'])
     end
+
     def search_dht=(opt)
       set_pref('searchdht', opt)
     end
+
     def search_dht?
-      bool(preferences["searchdht"])
+      bool(preferences['searchdht'])
     end
+
     def use_relay=(opt)
       set_pref('relay', opt)
     end
+
     def use_relay?
-      bool(preferences["relay"])
+      bool(preferences['relay'])
     end
+
     def delete_to_trash=(opt)
       set_pref('deletetotrash', opt)
     end
+
     def delete_to_trash?
-      bool(preferences["deletetotrash"])
+      bool(preferences['deletetotrash'])
     end
-    def is_writable? with_dir
-      bool(preferences["iswritable"])
+
+    def is_writable?
+      bool(preferences['iswritable'])
     end
+
     def preferences
-      res = get(path('getfolderpref'), :query => { :name => @name, :secret => @secret})
-      res.parsed_response["folderpref"]
+      res = get(path('getfolderpref'), query: { name: @name, secret: @secret })
+      res.parsed_response['folderpref']
     end
+
     def read_only_secret
-      preferences["readonlysecret"]
+      preferences['readonlysecret']
     end
+
     private
-    def set_pref pref, opt
-      res = get(path('setfolderpref'), :query => make_opts(pref, opt) )
+
+    def set_pref(pref, opt)
+      get(path('setfolderpref'), query: make_opts(pref, opt))
       true
     end
+
     def default_settings
-      opts = {
-        'name'=>@name,
-        'secret'=>@secret,
+      get(path('setfolderpref'), query: defaults)
+    end
+
+    def defaults
+      {
+        'name' => @name,
+        'secret' => @secret,
         'relay' => 1,
         'usetracker' => 1,
         'searchlan' => 1,
@@ -123,37 +168,47 @@ class BtSync
         'deletetotrash' => 1,
         'usehosts' => 1
       }
-      get(path('setfolderpref'), :query => opts )
     end
-    def make_opts name, opt
+
+    def make_opts(name, opt)
      opts = preferences
      opts[name] = bool_to_i(opt)
      opts.delete('readonlysecret')
-     opts.merge!({:name => @name, :secret => @secret})
+     opts.merge!({ name: @name, secret: @secret })
     end
-    def bool i
+
+    def secret_params(s)
+      {
+        name: @name,
+        secret: @secret,
+        newsecret: s
+      }
+    end
+
+    def bool(i)
+      i = i.to_i
       if i == 0
         false
-      elsif i == 1
-        true
       else
-        i
+        true
       end
     end
-    def bool_to_i bool
+
+    def bool_to_i(bool)
       if bool
         1
       else
         0
       end
     end
+
     def find_or_create
       res = get(path('getsyncfolders'))
-      folder_list = res.parsed_response["folders"]
-      if folder_list.map{|f| f["name"]}.include? name
+      folder_list = res.parsed_response['folders']
+      if folder_list.map { |f| f['name'] }.include? name
         true
       else
-        res = get(path('addsyncfolder'), :query => { :name => name, :secret => secret})
+        res = get(path('addsyncfolder'), query: { name: name, secret: secret })
       end
     end
   end