BtSync 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA512: 
-  metadata.gz: 21b0171af7da2cd9b686d6259f5649fb520b643d001ec883130f1cdea188ff1e4377f802a1240a37d5a0f415b79e8caa804fe4ae65f43b4ec8365aba6a1a8821
-  data.tar.gz: a33fc44ae08d5e11c9f1509111440b59df349e9d23c07c20ab5244c462efda03d4a8ee018a3f99f8213286129a0fdcf75df007abfab6680cfc786c94a5ba6dc0
-SHA1: 
-  metadata.gz: 06ebccf1bf025cba4bbadec32ad28a64d5a6f796
-  data.tar.gz: 656fe16887a65e3f533ee54a511d92f90dc955c2
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODYwZWQyNTQ5MmY5ZTk0MWU3YWM1MTYwYmM0ZjVkNjY0MDI1MTUxZg==
+  data.tar.gz: !binary |-
+    ZmRkODRiNDAxMGZiN2Q5N2UyNTk2NjFiNTExN2Q0ZDIwNGNjMTkxYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NWQ3ZjcxZDc0NWFmODBiYjYwYmQzNmM3N2M2NGIxZGYyODc4OTcxYjNjZjI0
+    MWE5Y2E5NmY2ZTNhMjNhNjRkNzc4NmM1OTUyYTBhYTU0ZjUzZjM0NWFmMGIw
+    NjQwY2Q2NDE5ZDVlNDI2ZTNmMThjNDJjYTNmNWMzN2NiY2E1OWY=
+  data.tar.gz: !binary |-
+    OTFjNjFmNmJjNmY5MmJhZmM1ODMwMTkzYTllODhlZmQyMjZlYmJkNzhlMGRj
+    ZTY4OWViODMyNzNmMTdlMDQ0MzlmY2EwYjI2NzI1ZTcyNmZmZmUzMTE0YTcx
+    OGMwZjQxM2YyNDcwNWUzOGJkNTVmOTJlNGZmZWUzM2IwNjBiNDg=

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/lib/btsync.rb

@@ -3,18 +3,17 @@ require 'httparty'
 class BtSync
   include HTTParty
   default_params :output => 'json'
+  debug_output
   def initialize uri=nil, port=nil
-    @cache = {
-      :folder => 0,
-      :secret => 0,
-      :settings => 0,
-      :os_type => 0,
-      :version => 0,
-      :new_version => 0
-    }
     @uri = uri
     @port = port
-    token
+    @errors = []
+    @token_cache = 0
+  end
+  def errors
+    errors = @errors
+    @errors = []
+    errors
   end
   def get_folders
     get_folder_list["folders"]
@@ -25,56 +24,141 @@ class BtSync
     down = s[1].split(" ")
     {:up => up[0], :down => down[0], :metric => up[1]}
   end
-
-  def get_settings
-    time = DateTime.now.strftime("%s").to_i
-    if time > @cache[:settings] + 600
-      res = self.class.get(path('getsettings'), :headers => {"Cookie" => cookies })
-      @settings = res.parsed_response["settings"]
-      @cache[:settings] = time
+  def remove_folder folder_name, my_secret = nil
+    my_secret ||= secret(folder_name)
+    res = self.class.get(path('removefolder'), :query => { :name => folder_name, :secret => my_secret}, :headers => {"Cookie" => cookies})
+    token(true)
+    true
+  end
+  def add_folder folder_name, my_secret = nil
+    my_secret ||= generate_secret
+    res = self.class.get(path('addsyncfolder'), :query => { :name => folder_name, :secret => my_secret}, :headers => {"Cookie" => cookies})
+    unless res["error"] == 0
+      @errors << res["message"]
+      return false
     end
-    @settings
+    token(true)
+    true
+  end
+  def update_secret with_dir, new_secret = nil, my_secret = nil
+    my_secret ||= secret(with_dir)
+    new_secret ||= generate_secret
+    self.class.get(path('updatesecret'), :query => { :name => with_dir, :secret => my_secret, :newsecret => new_secret}, :headers => {"Cookie" => cookies})
+    true
+  end
+  def use_tracker with_dir, opt = true
+    res = self.class.get(path('setfolderpref'), query: make_opts(with_dir, 'usetracker', opt), :headers => {"Cookie" => cookies })
+    true
+  end
+  def use_tracker? with_dir
+    bool(get_folder_preferences(with_dir)["usetracker"])
+  end
+  def use_hosts with_dir, opt = false
+    res = self.class.get(path('setfolderpref'), query: make_opts(with_dir, 'usehosts', opt), :headers => {"Cookie" => cookies })
+    true
+  end
+  def use_hosts? with_dir
+    bool(get_folder_preferences(with_dir)["usehosts"])
+  end
+  def search_lan with_dir, opt = true
+    res = self.class.get(path('setfolderpref'), query: make_opts(with_dir, 'searchlan', opt), :headers => {"Cookie" => cookies })
+    true
+  end
+  def search_lan? with_dir
+    bool(get_folder_preferences(with_dir)["searchlan"])
+  end
+  def search_dht with_dir, opt = false
+    res = self.class.get(path('setfolderpref'), query: make_opts(with_dir, 'searchdht', opt), :headers => {"Cookie" => cookies })
+    true
+  end
+  def search_dht? with_dir
+    bool(get_folder_preferences(with_dir)["searchdht"])
+  end
+  def use_relay with_dir, opt = true
+    res = self.class.get(path('setfolderpref'), query: make_opts(with_dir, 'relay', opt), :headers => {"Cookie" => cookies })
+    true
+  end
+  def use_relay? with_dir
+    bool(get_folder_preferences(with_dir)["relay"])
+  end
+  def delete_to_trash with_dir, opt = true
+    res = self.class.get(path('setfolderpref'), query: make_opts(with_dir, 'deletetotrash', opt), :headers => {"Cookie" => cookies })
+    true
+  end
+  def delete_to_trash? with_dir
+    bool(get_folder_preferences(with_dir)["deletetotrash"])
+  end
+  def is_writable? with_dir
+    bool(get_folder_preferences(with_dir)["iswritable"])
+  end
+  def generate_secret
+    res = self.class.get(path('generatesecret'), :headers => {"Cookie" => cookies })
+    res.parsed_response["secret"]
+  end
+  def get_settings
+    res = self.class.get(path('getsettings'), :headers => {"Cookie" => cookies })
+    res.parsed_response["settings"]
   end
   def get_os_type
-    time = DateTime.now.strftime("%s").to_i
-    if time > @cache[:os_type] + 600
-      res = self.class.get(path('getostype'), :headers => {"Cookie" => cookies })
-      @os_type = res.parsed_response["os"]
-      @cache[:os_type] = time
-    end
-    @os_type
+    res = self.class.get(path('getostype'), :headers => {"Cookie" => cookies })
+    res.parsed_response["os"]
   end
   def get_version
-    time = DateTime.now.strftime("%s").to_i
-    if time > @cache[:version] + 600
-      res = self.class.get(path('getversion'), :headers => {"Cookie" => cookies })
-      @version = res.parsed_response["version"]
-      @cache[:version] = time
-    end
-    @version
+    res = self.class.get(path('getversion'), :headers => {"Cookie" => cookies })
+    res.parsed_response["version"]
   end
   def check_new_version
-    time = DateTime.now.strftime("%s").to_i
-    if time > @cache[:new_version] + 600
-      res = self.class.get(path('checknewversion'), :headers => {"Cookie" => cookies })
-      @new_version = res.parsed_response["version"]
-      @cache[:new_version] = time
-    end
-    @new_version
+    res = self.class.get(path('checknewversion'), :headers => {"Cookie" => cookies })
+    res.parsed_response["version"]
+  end
+  def get_folder_preferences folder_name, my_secret = nil
+    my_secret ||= secret(folder_name)
+    res = self.class.get(path('getfolderpref'), :query => { :name => folder_name, :secret => my_secret}, :headers => {"Cookie" => cookies})
+    res.parsed_response["folderpref"]
   end
   def get_dir with_dir
     res = self.class.get(path('getdir'), :query => {:dir => with_dir}, :headers => {"Cookie" => cookies })
     res.parsed_response["folders"]
   end
+  def get_known_hosts with_dir, my_secret = nil
+    my_secret ||= secret(with_dir)
+    res = self.class.get(path('getknownhosts'), :query => {:name => with_dir, :secret => my_secret}, :headers => {"Cookie" => cookies })
+    res["hosts"]
+  end
+  def secret with_dir
+    f = get_folders.select{|folder| folder["name"] == with_dir}.first
+    f["secret"]
+  end
+  def get_read_only_secret with_dir, my_secret = nil
+    my_secret ||= secret(with_dir)
+    get_folder_preferences(with_dir, my_secret)["readonlysecret"]
+  end
   private
-  def get_folder_list
-    time = DateTime.now.strftime("%s").to_i
-    if time > @cache[:folder] + 600
-      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
-      @folder_list = res.parsed_response
-      @cache[:folder] = time
+  def make_opts with_dir, name, opt
+    opts = get_folder_preferences(with_dir)
+    opts[name] = bool_to_i(opt)
+    opts.delete('readonlysecret')
+    opts.merge!({:name => with_dir, :secret => secret(with_dir)})
+  end
+  def bool i
+    if i == 0
+      false
+    elsif i == 1
+      true
+    else
+      i
     end
-    @folder_list
+  end
+  def bool_to_i bool
+    if bool
+      1
+    else
+      0
+    end
+  end
+  def get_folder_list
+    res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
+    @folder_list = res.parsed_response
   end
 
   def port
@@ -83,19 +167,24 @@ class BtSync
   def uri
     @uri ||= "http://localhost"
   end
-  def token
+  def token force = false
     time = DateTime.now.strftime("%s").to_i
-    if time > @cache[:secret] + 600
-      @token = request_token.gsub('</div></html>', '').gsub("<html><div id='token' style='display:none;'>", '')
-      @cache[:secret] = time
+    if time > @token_cache + 600 || force
+      @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]
   end
-  def request_token
-    @request_token ||= self.class.get("#{uri}:#{port}/gui/token.html", :query => {:output => :text})
+  def request_token force = false
+    if @request_token.nil? || force
+      @request_token = self.class.get("#{uri}:#{port}/gui/token.html", :query => {:output => :text})
+    else
+      @request_token
+    end
   end
   def path action_name
     "#{uri}:#{port}/gui/?token=#{token}&action=#{action_name}"

data/lib/btsync/version.rb

@@ -1,3 +1,3 @@
 module BtsyncVersion
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

data/spec/BtSync/bt_sync_spec.rb

@@ -1,18 +1,17 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'btsync'
 describe 'BtSync' do
-  before do
+  before(:each) do
     VCR.use_cassette("Setup-BtSync") do
       @bt = BtSync.new
     end
   end
+
   it "can view a folder list" do
     VCR.use_cassette("get-folders") do
       @folder = @bt.get_folders.first
     end
-    @folder["secret"].should == "KLXT6ZZBEABLFIL6X7VBHT7YA4YQQOJM"
-    @folder["peers"].should == []
-    @folder["size"].should == "21 B in 1 files"
+    @folder["name"].should == "/home/chris/Documents"
   end
   it "can view settings" do
     VCR.use_cassette("get-settings") do
@@ -33,4 +32,24 @@ describe 'BtSync' do
     end
     @version.should == 16777350
   end
+  it "can add and delete a folder" do
+    VCR.use_cassette("add-folder") do
+      @bt.add_folder '/home/chris/bt_test'
+    end
+    VCR.use_cassette("add-folder-list") do
+      folders = @bt.get_folders
+      folders.count.should == 2
+      folder = folders.last
+      folder["name"].should == "/home/chris/bt_test"
+    end
+    VCR.use_cassette("remove-folder") do
+      @bt.remove_folder '/home/chris/bt_test'
+    end
+    VCR.use_cassette("remove-folder-list") do
+      folders = @bt.get_folders
+      folders.count.should == 1
+      folder = folders.last
+      folder["name"].should == "/home/chris/Documents"
+    end
+  end
 end

data/spec/fixtures/cassettes/add-folder-list.yml

@@ -0,0 +1,33 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=QCUnp9BcpaVLftYoQ2ZB
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '311'
+      Content-Type:
+      - application/json; charset=utf-8
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
+        "secret": "6VX7XSMS5R2CSDKLXBENUZIENMVUONRT", "size": "21 B in 1 files" },
+        { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "EV63ZJO7DX25LMMRDDQWDDQ3XZ4ETJV5",
+        "size": "0 B in 0 files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/add-folder.yml

@@ -0,0 +1,87 @@
+---
+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=QCUnp9BcpaVLftYoQ2ZB; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=generatesecret&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=QCUnp9BcpaVLftYoQ2ZB
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '97'
+      Content-Type:
+      - application/json; charset=utf-8
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{ "rosecret": "RXMAKBNPSWLXHML7WKZJLNDKI5N7ESOJZ", "secret": "LGNHKDANNJJIGN4NU4PBV4IS3TAEWGDS"
+        }'
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=addsyncfolder&name=/home/chris/bt_test&output=json&secret=LGNHKDANNJJIGN4NU4PBV4IS3TAEWGDS&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=QCUnp9BcpaVLftYoQ2ZB
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '160'
+      Content-Type:
+      - application/json; charset=utf-8
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{ "error": 200, "message": "Selected folder is already added to BitTorrent
+        Sync.", "n": "\/home\/chris\/bt_test", "secret": "LGNHKDANNJJIGN4NU4PBV4IS3TAEWGDS"
+        }'
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/get-folders.yml

@@ -1,28 +1,60 @@
---- 
-recorded_with: VCR 2.5.0
-http_interactions: 
-- request: 
+---
+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=UlSArc3wDYfvcUrEuASX; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>3LoV0nj_bN345atjFiAg6B8JpJT6Fg8Dxh8U5QFeBF6kpf1M0MsyqRlOr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+- request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=grsJ7BMbd6FPJND8DVjjZBZdHKV44iACI83vsaYfENHJYr2peP4GJdU7rlEAAAAA
-    body: 
-      string: ""
-    headers: 
-      Cookie: 
-      - GUID=SklJvMPAaAAUrQIQ3W3i
-  response: 
-    status: 
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=3LoV0nj_bN345atjFiAg6B8JpJT6Fg8Dxh8U5QFeBF6kpf1M0MsyqRlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=UlSArc3wDYfvcUrEuASX
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      Connection: 
+    headers:
+      Connection:
       - keep-alive
-      Content-Type: 
+      Content-Length:
+      - '311'
+      Content-Type:
       - application/json; charset=utf-8
-      Content-Length: 
-      - "186"
-      Cache-Control: 
+      Cache-Control:
       - no-cache
-    body: 
-      string: "{ \"folders\": [ { \"name\": \"\\/home\\/chris\\/Documents\", \"peers\": [  ], \"secret\": \"KLXT6ZZBEABLFIL6X7VBHT7YA4YQQOJM\", \"size\": \"21 B in 1 files\" } ], \"speed\": \"0.0 kB\\/s up, 0.0 kB\\/s down\" }"
+    body:
+      encoding: US-ASCII
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
+        "secret": "6VX7XSMS5R2CSDKLXBENUZIENMVUONRT", "size": "21 B in 1 files" },
+        { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "EV63ZJO7DX25LMMRDDQWDDQ3XZ4ETJV5",
+        "size": "0 B in 0 files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
     http_version: 
-  recorded_at: Tue, 04 Jun 2013 19:11:20 GMT
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/get-os-type.yml

@@ -1,28 +1,57 @@
---- 
-recorded_with: VCR 2.5.0
-http_interactions: 
-- request: 
+---
+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=E8QEpnn31pUHTfaat2xB; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>xhHpPZNEhQHIv1F-lM7CrvqrsNp_F2-lgweazZXUsAt3ZECxYkkvmhlOr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+- request:
     method: get
-    uri: http://localhost:8888/gui/?action=getostype&output=json&token=grsJ7BMbd6FPJND8DVjjZBZdHKV44iACI83vsaYfENHJYr2peP4GJdU7rlEAAAAA
-    body: 
-      string: ""
-    headers: 
-      Cookie: 
-      - GUID=SklJvMPAaAAUrQIQ3W3i
-  response: 
-    status: 
+    uri: http://localhost:8888/gui/?action=getostype&output=json&token=xhHpPZNEhQHIv1F-lM7CrvqrsNp_F2-lgweazZXUsAt3ZECxYkkvmhlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=E8QEpnn31pUHTfaat2xB
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      Connection: 
+    headers:
+      Connection:
       - keep-alive
-      Content-Type: 
+      Content-Length:
+      - '17'
+      Content-Type:
       - application/json; charset=utf-8
-      Content-Length: 
-      - "17"
-      Cache-Control: 
+      Cache-Control:
       - no-cache
-    body: 
-      string: "{ \"os\": \"linux\" }"
+    body:
+      encoding: US-ASCII
+      string: ! '{ "os": "linux" }'
     http_version: 
-  recorded_at: Tue, 04 Jun 2013 19:11:20 GMT
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/get-settings.yml

@@ -1,28 +1,58 @@
---- 
-recorded_with: VCR 2.5.0
-http_interactions: 
-- request: 
+---
+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=5VHKF4UDutvWFb60xkAE; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>hyPzlNlTakxYRbFDwMZVRm5dPpjbgMpwrUb3MCh4piy_H5W8E2JUxhlOr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+- request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsettings&output=json&token=grsJ7BMbd6FPJND8DVjjZBZdHKV44iACI83vsaYfENHJYr2peP4GJdU7rlEAAAAA
-    body: 
-      string: ""
-    headers: 
-      Cookie: 
-      - GUID=SklJvMPAaAAUrQIQ3W3i
-  response: 
-    status: 
+    uri: http://localhost:8888/gui/?action=getsettings&output=json&token=hyPzlNlTakxYRbFDwMZVRm5dPpjbgMpwrUb3MCh4piy_H5W8E2JUxhlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=5VHKF4UDutvWFb60xkAE
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      Connection: 
+    headers:
+      Connection:
       - keep-alive
-      Content-Type: 
+      Content-Length:
+      - '119'
+      Content-Type:
       - application/json; charset=utf-8
-      Content-Length: 
-      - "119"
-      Cache-Control: 
+      Cache-Control:
       - no-cache
-    body: 
-      string: "{ \"settings\": { \"devicename\": \"IceyEC-Virtual1\", \"dlrate\": 0, \"listeningport\": 63754, \"portmapping\": 1, \"ulrate\": 0 } }"
+    body:
+      encoding: US-ASCII
+      string: ! '{ "settings": { "devicename": "IceyEC-Virtual1", "dlrate": 0, "listeningport":
+        63754, "portmapping": 1, "ulrate": 0 } }'
     http_version: 
-  recorded_at: Tue, 04 Jun 2013 19:11:20 GMT
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/get-version.yml

@@ -1,28 +1,57 @@
---- 
-recorded_with: VCR 2.5.0
-http_interactions: 
-- request: 
+---
+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=GoXJLgGXVpf8y8SEot2L; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>-afkqn0LVJ2YA6qsCgzbECZCMaC0c_tZzY7E24t3veFaMQYcSP0ncBlOr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+- request:
     method: get
-    uri: http://localhost:8888/gui/?action=getversion&output=json&token=grsJ7BMbd6FPJND8DVjjZBZdHKV44iACI83vsaYfENHJYr2peP4GJdU7rlEAAAAA
-    body: 
-      string: ""
-    headers: 
-      Cookie: 
-      - GUID=SklJvMPAaAAUrQIQ3W3i
-  response: 
-    status: 
+    uri: http://localhost:8888/gui/?action=getversion&output=json&token=-afkqn0LVJ2YA6qsCgzbECZCMaC0c_tZzY7E24t3veFaMQYcSP0ncBlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=GoXJLgGXVpf8y8SEot2L
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      Connection: 
+    headers:
+      Connection:
       - keep-alive
-      Content-Type: 
+      Content-Length:
+      - '23'
+      Content-Type:
       - application/json; charset=utf-8
-      Content-Length: 
-      - "23"
-      Cache-Control: 
+      Cache-Control:
       - no-cache
-    body: 
-      string: "{ \"version\": 16777350 }"
+    body:
+      encoding: US-ASCII
+      string: ! '{ "version": 16777350 }'
     http_version: 
-  recorded_at: Tue, 04 Jun 2013 19:11:20 GMT
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/remove-folder-list.yml

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=QCUnp9BcpaVLftYoQ2ZB
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '186'
+      Content-Type:
+      - application/json; charset=utf-8
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
+        "secret": "6VX7XSMS5R2CSDKLXBENUZIENMVUONRT", "size": "21 B in 1 files" }
+        ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/remove-folder.yml

@@ -0,0 +1,60 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=QCUnp9BcpaVLftYoQ2ZB
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '311'
+      Content-Type:
+      - application/json; charset=utf-8
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
+        "secret": "6VX7XSMS5R2CSDKLXBENUZIENMVUONRT", "size": "21 B in 1 files" },
+        { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "EV63ZJO7DX25LMMRDDQWDDQ3XZ4ETJV5",
+        "size": "0 B in 0 files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=removefolder&name=/home/chris/bt_test&output=json&secret=EV63ZJO7DX25LMMRDDQWDDQ3XZ4ETJV5&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=QCUnp9BcpaVLftYoQ2ZB
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '4'
+      Content-Type:
+      - application/json; charset=utf-8
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{  }'
+    http_version: 
+  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+recorded_with: VCR 2.5.0

metadata

@@ -1,79 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: BtSync
-version: !ruby/object:Gem::Version 
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Chris MacNaughton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id003 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  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
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-description: Class to interact with BTSync's web interface using their unofficial API
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Class to interact with BTSync's web interface using their unofficial
+  API
+email:
 - chmacnaughton@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .ruby-gemset
 - .ruby-version
@@ -85,40 +113,47 @@ files:
 - lib/btsync.rb
 - lib/btsync/version.rb
 - spec/BtSync/bt_sync_spec.rb
-- spec/fixtures/cassettes/Setup-BtSync.yml
+- spec/fixtures/cassettes/add-folder-list.yml
+- spec/fixtures/cassettes/add-folder.yml
 - spec/fixtures/cassettes/get-folders.yml
 - spec/fixtures/cassettes/get-os-type.yml
 - spec/fixtures/cassettes/get-settings.yml
 - spec/fixtures/cassettes/get-version.yml
+- spec/fixtures/cassettes/remove-folder-list.yml
+- spec/fixtures/cassettes/remove-folder.yml
 - spec/spec_helper.rb
 homepage: http://chrismacnaughton.com/projects#btsync
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Class to interact with BTSync's web interface
-test_files: 
+test_files:
 - spec/BtSync/bt_sync_spec.rb
-- spec/fixtures/cassettes/Setup-BtSync.yml
+- spec/fixtures/cassettes/add-folder-list.yml
+- spec/fixtures/cassettes/add-folder.yml
 - spec/fixtures/cassettes/get-folders.yml
 - spec/fixtures/cassettes/get-os-type.yml
 - spec/fixtures/cassettes/get-settings.yml
 - spec/fixtures/cassettes/get-version.yml
+- spec/fixtures/cassettes/remove-folder-list.yml
+- spec/fixtures/cassettes/remove-folder.yml
 - spec/spec_helper.rb

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

@@ -1,29 +0,0 @@
---- 
-recorded_with: VCR 2.5.0
-http_interactions: 
-- request: 
-    method: get
-    uri: http://localhost:8888/gui/token.html
-    body: 
-      string: ""
-    headers: {}
-
-  response: 
-    status: 
-      code: 200
-      message: OK
-    headers: 
-      Set-Cookie: 
-      - GUID=SklJvMPAaAAUrQIQ3W3i; path=/
-      Connection: 
-      - keep-alive
-      Content-Type: 
-      - text/html
-      Content-Length: 
-      - "121"
-      Cache-Control: 
-      - no-cache
-    body: 
-      string: <html><div id='token' style='display:none;'>grsJ7BMbd6FPJND8DVjjZBZdHKV44iACI83vsaYfENHJYr2peP4GJdU7rlEAAAAA</div></html>
-    http_version: 
-  recorded_at: Tue, 04 Jun 2013 19:11:20 GMT