BtSync 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzg5MTEzZmIxNThlNDg4Y2MyYWE3NjkyN2RiMjU5YzdmNDY0ZGY4OA==
+    YjVhMWQ2M2E1YmJiMGJhZjdhOGFjMTc4MTIyNWM4ZGI1Y2YyODFkNQ==
   data.tar.gz: !binary |-
-    ZjE4Mjk4YjNhMzI0OTcwNTlkOGEwZDcwN2VlMGY1MTgzYjY0MTVkZA==
+    MDkwMDJlZjEwYTY1MGJiNTBlOTgxMDhjYjI2MDc5NjIxMDUyMDk0YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjBhNmY4MDYyMmMyYzRmZmYyZmE3YTg0ZmZhY2JkZWQ3ZGE0NGRjMzY3MDUx
-    YmQ5Y2FhMDFjMjU5ZTFmZGMzZGM5YjVjNzdkOWE2NDQxMTI1MzU4MGM2ZmQ5
-    NzFkNjliMzE4NDMyYWE4NDRmMzYwMWNkOTU1NWJkOGY0MTc0Yzk=
+    YjJiOGYzZDBiNDM0NGI0YWNiYjlhNWZkZDE3NGQ0ODAyZjU4YWNjZjJmNGVj
+    YTExNDIyNDAyOWYyNjlmNDkxNzAzOGM0MzZlZDhhYzgxMzJhMjE4MGY3OTFk
+    YzdlZTVmMGNiODA3ZjM0MWRjM2FmNGFjNzNlZDliMDA1OTQwY2I=
   data.tar.gz: !binary |-
-    NTUwY2Y4MjMxOWVmYmRhYTU2NzUxNjkzZDlhYTU3NWJlYmE1YzNhYjRmMmJk
-    MWVlNDQxYWNjN2MzMjJlMDkxMmU2OTMzZjhhZjRmNTM4ZmZlNTUzZmFmMTE2
-    YjhmYWQ5MmRhZDdmOTQ3NjFhMTcyODY1NjQ0YTFiMGZkZDI0Yjg=
+    YjdiODc3YzAzYTNiNzQxYTA5NzY3ZWI1NWQ5YmE4OTBlZTUzYjE0ZmFkNjZm
+    ZjQ0ODQyOTFhMDVlNWNlODBjM2FjYjcxMDAwNTJlOTExYTE1NjRjMmNkMmE3
+    ZGM4N2UyNmVhYjBkNTQ3NTdiYTRiY2VmZWU5NDNlMzE4Zjg1MmE=

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+script: bundle exec rspec spec
+notifications:
+  email: false

data/README.md

@@ -1,5 +1,7 @@
 # BtSync
 
+[![Build Status](https://travis-ci.org/ChrisMacNaughton/BtSync.png?branch=master)](https://travis-ci.org/ChrisMacNaughton/BtSync)
+
 BtSync is a library to help you interact with Bittorrent Sync in Ruby
 
 ## Installation

data/btsync.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "httparty"
   spec.add_runtime_dependency "active_support"
+  spec.add_runtime_dependency "json"
 end

data/lib/btsync.rb

@@ -3,6 +3,7 @@ lib = File.expand_path('../btsync', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'communicator'
+require 'directory'
 
 class BtSync
   include BtCommunicator
@@ -82,139 +83,6 @@ class BtSync
     res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
     @folder_list = res.parsed_response
   end
-
-  class Directory
-    include HTTParty
-    include BtCommunicator
-    default_params :output => 'json'
-
-    attr_reader :secret, :name
-
-    def initialize name, secret, btsync
-      @name = name
-      @secret = secret
-
-      @uri = btsync.uri
-      @port = btsync.port
-
-      find_or_create
-
-      @errors = []
-    end
-
-    def destroy
-      self.class.get(path('removefolder'), :query => { :name => name, :secret => secret}, :headers => {"Cookie" => cookies})
-      self.instance_variables.each{|v| v = nil}
-    end
-    def update_secret new_secret = nil
-      new_secret ||= generate_secret
-      res = self.class.get(path('updatesecret'), :query => { :name => @name, :secret =>  @secret, :newsecret => new_secret}, :headers => {"Cookie" => cookies})
-      if res.parsed_response != "{}" && res.parsed_response != '\r\ninvalid request'
-        @secret = new_secret
-        true
-      else
-        @errors << res.parsed_response
-        false
-      end
-    end
-    def folders
-      res = self.class.get(path('getdir'), :query => {:dir => @name}, :headers => {"Cookie" => cookies })
-      res.parsed_response["folders"]
-    end
-    def peers
-      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
-      f = res.parsed_response["folders"].select{|f| f["name"] == name}.first
-      f["peers"]
-    end
-    def known_hosts
-      res = self.class.get(path('getknownhosts'), :query => {:name => name, :secret => secret}, :headers => {"Cookie" => cookies })
-      res["hosts"]
-    end
-    def use_tracker=(opt)
-      res = self.class.get(path('setfolderpref'), query: make_opts('usetracker', opt), :headers => {"Cookie" => cookies })
-      true
-    end
-    def use_tracker?
-      bool(preferences["usetracker"])
-    end
-    def use_hosts=(opt)
-      res = self.class.get(path('setfolderpref'), query: make_opts('usehosts', opt), :headers => {"Cookie" => cookies })
-      true
-    end
-    def use_hosts?
-      bool(preferences["usehosts"])
-    end
-    def search_lan=(opt)
-      res = self.class.get(path('setfolderpref'), query: make_opts('searchlan', opt), :headers => {"Cookie" => cookies })
-      true
-    end
-    def search_lan?
-      bool(preferences["searchlan"])
-    end
-    def search_dht=(opt)
-      res = self.class.get(path('setfolderpref'), query: make_opts('searchdht', opt), :headers => {"Cookie" => cookies })
-      true
-    end
-    def search_dht?
-      bool(preferences["searchdht"])
-    end
-    def use_relay=(opt)
-      res = self.class.get(path('setfolderpref'), query: make_opts('relay', opt), :headers => {"Cookie" => cookies })
-      true
-    end
-    def use_relay?
-      bool(preferences["relay"])
-    end
-    def delete_to_trash=(opt)
-      res = self.class.get(path('setfolderpref'), query: make_opts('deletetotrash', opt), :headers => {"Cookie" => cookies })
-      true
-    end
-    def delete_to_trash?
-      bool(preferences["deletetotrash"])
-    end
-    def is_writable? with_dir
-      bool(preferences["iswritable"])
-    end
-    def preferences
-      res = self.class.get(path('getfolderpref'), :query => { :name => @name, :secret => @secret}, :headers => {"Cookie" => cookies})
-      res.parsed_response["folderpref"]
-    end
-    def read_only_secret
-      preferences["readonlysecret"]
-    end
-    private
-    def make_opts name, opt
-     opts = preferences
-     opts[name] = bool_to_i(opt)
-     opts.delete('readonlysecret')
-     opts.merge!({:name => @name, :secret => @secret})
-    end
-    def bool i
-      if i == 0
-        false
-      elsif i == 1
-        true
-      else
-        i
-      end
-    end
-    def bool_to_i bool
-      if bool
-        1
-      else
-        0
-      end
-    end
-    def find_or_create
-      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
-      folder_list = res.parsed_response["folders"]
-      if folder_list.map{|f| f["name"]}.include? name
-        true
-      else
-        res = self.class.get(path('addsyncfolder'), :query => { :name => name, :secret => secret}, :headers => {"Cookie" => cookies})
-      end
-    end
-  end
 end
 class Hash
   def symbolize

data/lib/btsync/directory.rb

@@ -0,0 +1,152 @@
+class BtSync
+  class Directory
+    include HTTParty
+    include BtCommunicator
+    default_params :output => 'json'
+    attr_reader :secret, :name
+
+    def initialize name, secret, btsync
+      @name = name
+      @secret = secret
+
+      @uri = btsync.uri
+      @port = btsync.port
+
+      find_or_create
+
+      @errors = []
+    end
+
+    def destroy
+      self.class.get(path('removefolder'), :query => { :name => name, :secret => secret}, :headers => {"Cookie" => cookies})
+      self.instance_variables.each{|v| v = nil}
+    end
+    def update_secret new_secret = nil
+      new_secret ||= generate_secret
+      res = self.class.get(path('updatesecret'), :query => { :name => @name, :secret =>  @secret, :newsecret => new_secret}, :headers => {"Cookie" => cookies})
+      if res.parsed_response != "{}" && res.parsed_response != '\r\ninvalid request'
+        @secret = new_secret
+        true
+      else
+        @errors << res.parsed_response
+        false
+      end
+    end
+    def folders
+      res = self.class.get(path('getdir'), :query => {:dir => @name}, :headers => {"Cookie" => cookies })
+      res.parsed_response["folders"]
+    end
+    def peers
+      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
+      f = res.parsed_response["folders"].select{|f| f["name"] == name}.first
+      f["peers"]
+    end
+    def known_hosts
+      res = self.class.get(path('getknownhosts'), :query => {:name => name, :secret => secret}, :headers => {"Cookie" => cookies })
+      res["hosts"]
+    end
+    def use_tracker=(opt)
+      res = self.class.get(path('setfolderpref'), :query => make_opts('usetracker', opt), :headers => {"Cookie" => cookies })
+      @preferences = nil
+      true
+    end
+    def use_tracker?
+      bool(preferences["usetracker"])
+    end
+    def use_hosts=(opt)
+      res = self.class.get(path('setfolderpref'), :query => make_opts('usehosts', opt), :headers => {"Cookie" => cookies })
+      @preferences = nil
+      true
+    end
+    def use_hosts?
+      bool(preferences["usehosts"])
+    end
+    def search_lan=(opt)
+      res = self.class.get(path('setfolderpref'), :query => make_opts('searchlan', opt), :headers => {"Cookie" => cookies })
+      @preferences = nil
+      true
+    end
+    def search_lan?
+      bool(preferences["searchlan"])
+    end
+    def search_dht=(opt)
+      res = self.class.get(path('setfolderpref'), :query => make_opts('searchdht', opt), :headers => {"Cookie" => cookies })
+      @preferences = nil
+      true
+    end
+    def search_dht?
+      bool(preferences["searchdht"])
+    end
+    def use_relay=(opt)
+      res = self.class.get(path('setfolderpref'), :query => make_opts('relay', opt), :headers => {"Cookie" => cookies })
+      @preferences = nil
+      true
+    end
+    def use_relay?
+      bool(preferences["relay"])
+    end
+    def delete_to_trash=(opt)
+      res = self.class.get(path('setfolderpref'), :query => make_opts('deletetotrash', opt), :headers => {"Cookie" => cookies })
+      @preferences = nil
+      true
+    end
+    def delete_to_trash?
+      bool(preferences["deletetotrash"])
+    end
+    def is_writable? with_dir
+      bool(preferences["iswritable"])
+    end
+    def preferences
+      res = self.class.get(path('getfolderpref'), :query => { :name => @name, :secret => @secret}, :headers => {"Cookie" => cookies})
+      res.parsed_response["folderpref"]
+    end
+    def read_only_secret
+      preferences["readonlysecret"]
+    end
+    private
+    def default_settings
+      opts = {
+        'name'=>@name,
+        'secret'=>@secret,
+        'relay' => 1,
+        'usetracker' => 1,
+        'searchlan' => 1,
+        'searchdht' => 0,
+        'deletetotrash' => 1,
+        'usehosts' => 1
+      }
+      self.class.get(path('setfolderpref'), :query => opts, :headers => {"Cookie" => cookies })
+    end
+    def make_opts name, opt
+     opts = preferences
+     opts[name] = bool_to_i(opt)
+     opts.delete('readonlysecret')
+     opts.merge!({:name => @name, :secret => @secret})
+    end
+    def bool i
+      if i == 0
+        false
+      elsif i == 1
+        true
+      else
+        i
+      end
+    end
+    def bool_to_i bool
+      if bool
+        1
+      else
+        0
+      end
+    end
+    def find_or_create
+      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
+      folder_list = res.parsed_response["folders"]
+      if folder_list.map{|f| f["name"]}.include? name
+        true
+      else
+        res = self.class.get(path('addsyncfolder'), :query => { :name => name, :secret => secret}, :headers => {"Cookie" => cookies})
+      end
+    end
+  end
+end

data/lib/btsync/version.rb

@@ -1,3 +1,3 @@
 module BtsyncVersion
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/BtSync/directory_spec.rb

@@ -0,0 +1,85 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe 'BtSync::Directory' do
+  before(:each) do
+    VCR.use_cassette("Setup-BtSync-Directory") do
+      @bt = BtSync.new
+      @directory = BtSync::Directory.new(
+        '/home/chris/Documents',
+        '6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ',
+        @bt)
+    end
+    VCR.use_cassette('Setup-Directory-Settings') do
+      @directory.send('default_settings')
+    end
+  end
+  after(:each) do
+    VCR.use_cassette('Setup-Directory-Settings') do
+      @directory.send('default_settings')
+    end
+  end
+  it "can view contained folders" do
+    VCR.use_cassette("view-folders") do
+      @folders = @directory.folders
+    end
+    @folders.first.should == "/home/chris/Documents/test"
+  end
+  it "can get a list of peers" do
+    VCR.use_cassette("get-peers") do
+      @peers = @directory.peers
+    end
+    @peers.first["name"].should == "IceyEC Portable"
+  end
+  it "can get see known hosts" do
+    VCR.use_cassette("get-known-hosts") do
+      @hosts = @directory.known_hosts
+    end
+    @hosts.first["peer"].should == "192.168.1.5:45685"
+  end
+  it "can check it's settings" do
+    VCR.use_cassette("get-preferences") do
+      @directory.use_tracker?.should == true
+      @directory.use_hosts?.should == true
+      @directory.search_lan?.should == true
+      @directory.search_dht?.should == false
+      @directory.use_relay?.should == true
+      @directory.delete_to_trash?.should == true
+    end
+  end
+  it "can change it's tracker settings" do
+    VCR.use_cassette("set-preferences-tracker") do
+      @directory.use_tracker = false
+      @directory.use_tracker?.should == false
+    end
+  end
+  it "can change it's hosts settings" do
+    VCR.use_cassette("set-preferences-hosts") do
+      @directory.use_hosts = false
+      @directory.use_hosts?.should == false
+    end
+  end
+  it "can change it's lan settings" do
+    VCR.use_cassette("set-preferences-lan") do
+      @directory.search_lan = false
+      @directory.search_lan?.should == false
+    end
+  end
+  it "can change it's dht settings" do
+    VCR.use_cassette("set-preferences-dht") do
+      @directory.search_dht = true
+      @directory.search_dht?.should == true
+    end
+  end
+  it "can change it's relay settings" do
+    VCR.use_cassette("set-preferences-relay") do
+      @directory.use_relay = false
+      @directory.use_relay?.should == false
+    end
+  end
+  it "can change it's delete settings" do
+    VCR.use_cassette("set-preferences-delete") do
+      @directory.delete_to_trash = false
+      @directory.delete_to_trash?.should == false
+    end
+  end
+end

data/spec/fixtures/cassettes/Setup-BtSync-Directory.yml

@@ -0,0 +1,60 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8888/gui/token.html?output=text
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '121'
+      Content-Type:
+      - text/html
+      Set-Cookie:
+      - GUID=viqdjPnu05Y1N0pnFKQ7; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>iRasMRAah3u6ZZL5nDz7pcjSl9wT5iHuJPM3epeVqG6O57gXNwXWRYWGsFEAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 12:54:29 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=iRasMRAah3u6ZZL5nDz7pcjSl9wT5iHuJPM3epeVqG6O57gXNwXWRYWGsFEAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=viqdjPnu05Y1N0pnFKQ7
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '270'
+      Content-Type:
+      - application/json; charset=utf-8
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files"
+        } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 12:54:29 GMT
+recorded_with: VCR 2.5.0