BtSync 0.3.2 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGJmZjExMGJiNzcwOTU1MTVhM2EwZDI1YzVkYmVmOGYwMWE0MDI4Mg==
+    Mzg5MTEzZmIxNThlNDg4Y2MyYWE3NjkyN2RiMjU5YzdmNDY0ZGY4OA==
   data.tar.gz: !binary |-
-    YjAwZDg4ZTk4YzI5NTRmNmEyNjk4M2E2YzI1ODExZDU0ZGFjYzk5NQ==
+    ZjE4Mjk4YjNhMzI0OTcwNTlkOGEwZDcwN2VlMGY1MTgzYjY0MTVkZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTE0ZWFkZWQ2MDA2NTdkZTAzYjE2NjkwODhjNTg5Y2I1NzNkMjVkMTUyNWI0
-    NTY0NmYxMzUwNTY0MjFiZmZkYTQ1NjRhMmViNTdkYWY1NDk3YTM3M2Q3ZWRh
-    NTAzY2E1NDgxNzgwMjQ5MmViZWRiYjg3Yzc2ZTM4MGViODcwM2E=
+    MjBhNmY4MDYyMmMyYzRmZmYyZmE3YTg0ZmZhY2JkZWQ3ZGE0NGRjMzY3MDUx
+    YmQ5Y2FhMDFjMjU5ZTFmZGMzZGM5YjVjNzdkOWE2NDQxMTI1MzU4MGM2ZmQ5
+    NzFkNjliMzE4NDMyYWE4NDRmMzYwMWNkOTU1NWJkOGY0MTc0Yzk=
   data.tar.gz: !binary |-
-    ZWU3YzZjNzA0MGI2M2ViYWFkYmY0NzU2MzQyODdhZjkwNzE4NGJkMDVlNjQx
-    MzFmZWY1MTZkMWE0ZDYzMDEyNjA2ZjYyNDUwYjZlOTI1ZTUzZjU1YThmYjlh
-    MGQzYmUwNzMxOWIyNGNjMjViYTE2ZDFlMjg4Y2JmOThhMDg1YWU=
+    NTUwY2Y4MjMxOWVmYmRhYTU2NzUxNjkzZDlhYTU3NWJlYmE1YzNhYjRmMmJk
+    MWVlNDQxYWNjN2MzMjJlMDkxMmU2OTMzZjhhZjRmNTM4ZmZlNTUzZmFmMTE2
+    YjhmYWQ5MmRhZDdmOTQ3NjFhMTcyODY1NjQ0YTFiMGZkZDI0Yjg=

data/README.md

@@ -28,7 +28,7 @@ bittorrent = BtSync.new
 
 A system directory managed with Bittorrent Sync is represented as a ```BtSync::Directory```.
 
-On a ```BtSync::Directory`` you can
+On a ```BtSync::Directory``` you can
 
 - Update the secret
 - change the settings for

data/btsync.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
 
   spec.add_runtime_dependency "httparty"
+  spec.add_runtime_dependency "active_support"
 end

data/lib/btsync.rb

@@ -8,10 +8,11 @@ class BtSync
   include BtCommunicator
   include HTTParty
   default_params :output => 'json'
-
-  def initialize uri=nil, port=nil
-    @uri = uri
-    @port = port
+  def initialize options = {}
+    @opts = options.symbolize
+    @opts.merge!({:uri => "http://localhost", :port => "8888", :user => "", :password => ""})
+    @uri = @opts[:uri]
+    @port =  @opts[:port]
     @errors = []
     @token_cache = 0
   end
@@ -20,11 +21,11 @@ class BtSync
     @errors = []
     errors
   end
-  def get_folders
+  def folders
     f = get_folder_list["folders"]
     folders = []
     f.each do |folder|
-      folders << Directory.new(folder["name"], folder["secret"])
+      folders << Directory.new(folder["name"], folder["secret"], self)
     end
     folders
   end
@@ -32,7 +33,7 @@ class BtSync
     s = get_folder_list["speed"].split(", ")
     up = s[0].split(" ")
     down = s[1].split(" ")
-    {:up => up[0], :down => down[0], :metric => up[1]}
+    {:up => {:speed => up[0], :metric => up[1]}, :down => {:speed => down[0], :metric => down[1]}}
   end
   def remove_folder folder_name, my_secret = nil
     my_secret ||= secret(folder_name)
@@ -46,7 +47,7 @@ class BtSync
       @errors << res["message"]
       return false
     end
-    Directory.new(folder_name, my_secret)
+    Directory.new(folder_name, my_secret, self)
   end
 
   def get_settings
@@ -72,7 +73,7 @@ class BtSync
   end
 
   def secret with_dir
-    f = get_folders.select{|folder| folder.name == with_dir}.first
+    f = folders.select{|folder| folder.name == with_dir}.first
     f.secret
   end
   private
@@ -89,11 +90,18 @@ class BtSync
 
     attr_reader :secret, :name
 
-    def initialize name, secret
+    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}
@@ -109,7 +117,16 @@ class BtSync
         false
       end
     end
-    def get_known_hosts
+    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
@@ -188,5 +205,27 @@ class BtSync
         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
+    r = {}
+    self.each do |k,v|
+      if k.is_a? String
+        r[k.to_symbol] = v
+      else
+        r[k] = v
+      end
+    end
+    r
+  end
+end

data/lib/btsync/communicator.rb

@@ -1,14 +1,15 @@
 module BtCommunicator
   include HTTParty
+
   def generate_secret
     res = self.class.get(path('generatesecret'), :headers => {"Cookie" => cookies })
     res.parsed_response["secret"]
   end
   def port
-    @port ||= '8888'
+    @port
   end
   def uri
-    @uri ||= "http://localhost"
+    @uri
   end
   def token force = false
     @token_cache ||= 0
@@ -23,14 +24,18 @@ module BtCommunicator
   def cookies
     @cookies ||= request_token.headers["set-cookie"].split("; ")[0]
   end
+  def root_url
+    "#{uri}:#{port}/"
+  end
   def request_token force = false
     if @request_token.nil? || force
-      @request_token = self.class.get("#{uri}:#{port}/gui/token.html", :query => {:output => :text})
+      @request_token = self.class.get("#{root_url}gui/token.html", :query => {:output => :text})
     else
       @request_token
     end
   end
+
   def path action_name
-    "#{uri}:#{port}/gui/?token=#{token}&action=#{action_name}"
+    "#{root_url}gui/?token=#{token}&action=#{action_name}"
   end
 end

data/lib/btsync/version.rb

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

data/spec/BtSync/bt_sync_spec.rb

@@ -9,7 +9,7 @@ describe 'BtSync' do
 
   it "can view a folder list" do
     VCR.use_cassette("get-folders") do
-      @folder = @bt.get_folders.first
+      @folder = @bt.folders.first
     end
     @folder.name.should == "/home/chris/Documents"
   end
@@ -37,7 +37,7 @@ describe 'BtSync' do
       @bt.add_folder '/home/chris/bt_test'
     end
     VCR.use_cassette("add-folder-list") do
-      folders = @bt.get_folders
+      folders = @bt.folders
       folders.count.should == 2
       folder = folders.last
       folder.name.should == "/home/chris/bt_test"
@@ -46,7 +46,7 @@ describe 'BtSync' do
       @bt.remove_folder '/home/chris/bt_test'
     end
     VCR.use_cassette("remove-folder-list") do
-      folders = @bt.get_folders
+      folders = @bt.folders
       folders.count.should == 1
       folder = folders.last
       folder.name.should == "/home/chris/Documents"

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

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=wbwVIFfLlCmeQpYzpa5InKk1Dxbc-8tnik1iTb3qnMM6mayySjmz5f_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=QCUnp9BcpaVLftYoQ2ZB
+      - GUID=mC6ybzSiwtc7IvhuMNSW
   response:
     status:
       code: 200
@@ -17,17 +17,134 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '311'
+      - '401'
       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",
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "1000.0 MB in 2
+        files" }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO",
         "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_at: Thu, 06 Jun 2013 01:38:07 GMT
+- 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=9V0bdfMJFRxDvhxl6sGr; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>9-8pha9n98_gwGGjSatoshysCT4ewkSn03czKuXOSM3yobKNMHjNcv_nr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=9-8pha9n98_gwGGjSatoshysCT4ewkSn03czKuXOSM3yobKNMHjNcv_nr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=9V0bdfMJFRxDvhxl6sGr
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '401'
+      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": "1000.0 MB in 2
+        files" }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO",
+        "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 01:38:07 GMT
+- 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=RDIgYa5udp1XpkjJ0krV; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>YIzd-NFqpDaDP7STwnuNGfeuQEV2bfBi6aOOTFai1H21p5b-cGpS5P_nr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=YIzd-NFqpDaDP7STwnuNGfeuQEV2bfBi6aOOTFai1H21p5b-cGpS5P_nr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=RDIgYa5udp1XpkjJ0krV
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '401'
+      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": "1000.0 MB in 2
+        files" }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO",
+        "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 01:38:07 GMT
 recorded_with: VCR 2.5.0

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

@@ -19,23 +19,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=QCUnp9BcpaVLftYoQ2ZB; path=/
+      - GUID=mC6ybzSiwtc7IvhuMNSW; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>wbwVIFfLlCmeQpYzpa5InKk1Dxbc-8tnik1iTb3qnMM6mayySjmz5f_nr1EAAAAA</div></html>
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=generatesecret&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=generatesecret&output=json&token=wbwVIFfLlCmeQpYzpa5InKk1Dxbc-8tnik1iTb3qnMM6mayySjmz5f_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=QCUnp9BcpaVLftYoQ2ZB
+      - GUID=mC6ybzSiwtc7IvhuMNSW
   response:
     status:
       code: 200
@@ -51,19 +51,19 @@ http_interactions:
       - no-cache
     body:
       encoding: US-ASCII
-      string: ! '{ "rosecret": "RXMAKBNPSWLXHML7WKZJLNDKI5N7ESOJZ", "secret": "LGNHKDANNJJIGN4NU4PBV4IS3TAEWGDS"
+      string: ! '{ "rosecret": "RHFJPTK4YT2LXCBCXMCHTUJYUBBQFQ5AD", "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO"
         }'
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=addsyncfolder&name=/home/chris/bt_test&output=json&secret=LGNHKDANNJJIGN4NU4PBV4IS3TAEWGDS&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=addsyncfolder&name=/home/chris/bt_test&output=json&secret=3QSICS26CUR326TWBTYI27KW7GCCNHVO&token=wbwVIFfLlCmeQpYzpa5InKk1Dxbc-8tnik1iTb3qnMM6mayySjmz5f_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=QCUnp9BcpaVLftYoQ2ZB
+      - GUID=mC6ybzSiwtc7IvhuMNSW
   response:
     status:
       code: 200
@@ -72,16 +72,72 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '160'
+      - '14'
       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"
-        }'
+      string: ! '{ "error": 0 }'
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
+- 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=8OWfABv5EA56p7dvTtAA; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>WQZyctyOeKAMU3BLfVmbR_bhZHbmVuthpx2yXnfqpRDJfZ462hB_A__nr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=WQZyctyOeKAMU3BLfVmbR_bhZHbmVuthpx2yXnfqpRDJfZ462hB_A__nr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=8OWfABv5EA56p7dvTtAA
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '401'
+      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": "1000.0 MB in 2
+        files" }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO",
+        "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_at: Thu, 06 Jun 2013 01:38:07 GMT
 recorded_with: VCR 2.5.0

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

@@ -19,23 +19,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=UlSArc3wDYfvcUrEuASX; path=/
+      - GUID=liFxUElAitKmeGMh1NCf; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>3LoV0nj_bN345atjFiAg6B8JpJT6Fg8Dxh8U5QFeBF6kpf1M0MsyqRlOr1EAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>koA3uu3isY4uxebU8PXhIHYBGdDptf8ejZ7KrqmFJcgOtXvyQKRE6f_nr1EAAAAA</div></html>
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=3LoV0nj_bN345atjFiAg6B8JpJT6Fg8Dxh8U5QFeBF6kpf1M0MsyqRlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=koA3uu3isY4uxebU8PXhIHYBGdDptf8ejZ7KrqmFJcgOtXvyQKRE6f_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=UlSArc3wDYfvcUrEuASX
+      - GUID=liFxUElAitKmeGMh1NCf
   response:
     status:
       code: 200
@@ -44,17 +44,74 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '311'
+      - '276'
       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" }'
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "1000.0 MB in 2
+        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_at: Thu, 06 Jun 2013 01:38:07 GMT
+- 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=j7SP0pU0UAufo2POYEwP; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>i5DQUA_HEzcBjT9ElX_jbqJTf8KHbFZy-_5jLuaHw91sLKLBu-llvf_nr1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=i5DQUA_HEzcBjT9ElX_jbqJTf8KHbFZy-_5jLuaHw91sLKLBu-llvf_nr1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=j7SP0pU0UAufo2POYEwP
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '276'
+      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": "1000.0 MB in 2
+        files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 recorded_with: VCR 2.5.0

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

@@ -19,23 +19,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=E8QEpnn31pUHTfaat2xB; path=/
+      - GUID=kCNiVsPWHYbdFb8OAME7; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>xhHpPZNEhQHIv1F-lM7CrvqrsNp_F2-lgweazZXUsAt3ZECxYkkvmhlOr1EAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>MvZ5eWyA_YmLxeMvCK8uaEhlAHHXduD3sdM3lX5CeOfTp7_fiB2at__nr1EAAAAA</div></html>
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getostype&output=json&token=xhHpPZNEhQHIv1F-lM7CrvqrsNp_F2-lgweazZXUsAt3ZECxYkkvmhlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=getostype&output=json&token=MvZ5eWyA_YmLxeMvCK8uaEhlAHHXduD3sdM3lX5CeOfTp7_fiB2at__nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=E8QEpnn31pUHTfaat2xB
+      - GUID=kCNiVsPWHYbdFb8OAME7
   response:
     status:
       code: 200
@@ -53,5 +53,5 @@ http_interactions:
       encoding: US-ASCII
       string: ! '{ "os": "linux" }'
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 recorded_with: VCR 2.5.0

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

@@ -19,23 +19,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=5VHKF4UDutvWFb60xkAE; path=/
+      - GUID=bA1jLdWQ9x6GDY8dj8wP; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>hyPzlNlTakxYRbFDwMZVRm5dPpjbgMpwrUb3MCh4piy_H5W8E2JUxhlOr1EAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>UbYWrwdHBZ_dxqyBVpxZNfPr9kgNwPJPWBJ7_nBoWulnWpmwaCroa__nr1EAAAAA</div></html>
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsettings&output=json&token=hyPzlNlTakxYRbFDwMZVRm5dPpjbgMpwrUb3MCh4piy_H5W8E2JUxhlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=getsettings&output=json&token=UbYWrwdHBZ_dxqyBVpxZNfPr9kgNwPJPWBJ7_nBoWulnWpmwaCroa__nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=5VHKF4UDutvWFb60xkAE
+      - GUID=bA1jLdWQ9x6GDY8dj8wP
   response:
     status:
       code: 200
@@ -54,5 +54,5 @@ http_interactions:
       string: ! '{ "settings": { "devicename": "IceyEC-Virtual1", "dlrate": 0, "listeningport":
         63754, "portmapping": 1, "ulrate": 0 } }'
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 recorded_with: VCR 2.5.0

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

@@ -19,23 +19,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=GoXJLgGXVpf8y8SEot2L; path=/
+      - GUID=ivezqZKyXPBW99WxeFq4; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>-afkqn0LVJ2YA6qsCgzbECZCMaC0c_tZzY7E24t3veFaMQYcSP0ncBlOr1EAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>61L6OZdVrA_8zmuqhXoZOFZg6ZwwGhr62tYA7dupg8AOasWipSvl4P_nr1EAAAAA</div></html>
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getversion&output=json&token=-afkqn0LVJ2YA6qsCgzbECZCMaC0c_tZzY7E24t3veFaMQYcSP0ncBlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=getversion&output=json&token=61L6OZdVrA_8zmuqhXoZOFZg6ZwwGhr62tYA7dupg8AOasWipSvl4P_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=GoXJLgGXVpf8y8SEot2L
+      - GUID=ivezqZKyXPBW99WxeFq4
   response:
     status:
       code: 200
@@ -53,5 +53,5 @@ http_interactions:
       encoding: US-ASCII
       string: ! '{ "version": 16777350 }'
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:07 GMT
 recorded_with: VCR 2.5.0

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

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=wbwVIFfLlCmeQpYzpa5InKk1Dxbc-8tnik1iTb3qnMM6mayySjmz5f_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=QCUnp9BcpaVLftYoQ2ZB
+      - GUID=mC6ybzSiwtc7IvhuMNSW
   response:
     status:
       code: 200
@@ -17,16 +17,74 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '186'
+      - '276'
       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" }'
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "1000.0 MB in 2
+        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_at: Thu, 06 Jun 2013 01:38:37 GMT
+- 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=TA3LLHxznBGs7j8xatNr; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>fsX9szUZdrG3mFVN7sQJfkKRmAQuH-BTbqUuDP47rf4HJLgQDmjcAB3or1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:37 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=fsX9szUZdrG3mFVN7sQJfkKRmAQuH-BTbqUuDP47rf4HJLgQDmjcAB3or1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=TA3LLHxznBGs7j8xatNr
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '276'
+      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": "1000.0 MB in 2
+        files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:37 GMT
 recorded_with: VCR 2.5.0

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

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=wbwVIFfLlCmeQpYzpa5InKk1Dxbc-8tnik1iTb3qnMM6mayySjmz5f_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=QCUnp9BcpaVLftYoQ2ZB
+      - GUID=mC6ybzSiwtc7IvhuMNSW
   response:
     status:
       code: 200
@@ -17,28 +17,145 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '311'
+      - '401'
       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",
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "1000.0 MB in 2
+        files" }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO",
         "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_at: Thu, 06 Jun 2013 01:38:37 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=removefolder&name=/home/chris/bt_test&output=json&secret=EV63ZJO7DX25LMMRDDQWDDQ3XZ4ETJV5&token=7P1iDM-j30_D4KpN4veMfy1O12KRXyAdIaSU2A1JsesOOPcU7IJwtBlOr1EAAAAA
+    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=46WXCLwGGfrrentU1yWR; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>JoP0Vy6RU96zkB8nmTsWM0LWPKg0KiA2yBCeb2hvk42II6sXhyk-gB3or1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:37 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=JoP0Vy6RU96zkB8nmTsWM0LWPKg0KiA2yBCeb2hvk42II6sXhyk-gB3or1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=46WXCLwGGfrrentU1yWR
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '401'
+      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": "1000.0 MB in 2
+        files" }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO",
+        "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 01:38:37 GMT
+- 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=T6Y5magarwzBPyjIp1zd; path=/
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: <html><div id='token' style='display:none;'>JAVukyunwkQTYbiGXeOFxLdzxI8bWJp4bfd4GeOCJy6Iqw9RBtSLtR3or1EAAAAA</div></html>
+    http_version: 
+  recorded_at: Thu, 06 Jun 2013 01:38:37 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=JAVukyunwkQTYbiGXeOFxLdzxI8bWJp4bfd4GeOCJy6Iqw9RBtSLtR3or1EAAAAA
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Cookie:
+      - GUID=T6Y5magarwzBPyjIp1zd
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '401'
+      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": "1000.0 MB in 2
+        files" }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "3QSICS26CUR326TWBTYI27KW7GCCNHVO",
+        "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 01:38:37 GMT
+- request:
+    method: get
+    uri: http://localhost:8888/gui/?action=removefolder&name=/home/chris/bt_test&output=json&secret=3QSICS26CUR326TWBTYI27KW7GCCNHVO&token=wbwVIFfLlCmeQpYzpa5InKk1Dxbc-8tnik1iTb3qnMM6mayySjmz5f_nr1EAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=QCUnp9BcpaVLftYoQ2ZB
+      - GUID=mC6ybzSiwtc7IvhuMNSW
   response:
     status:
       code: 200
@@ -56,5 +173,5 @@ http_interactions:
       encoding: US-ASCII
       string: ! '{  }'
     http_version: 
-  recorded_at: Wed, 05 Jun 2013 14:41:29 GMT
+  recorded_at: Thu, 06 Jun 2013 01:38:37 GMT
 recorded_with: VCR 2.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BtSync
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris MacNaughton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_support
+  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: Class to interact with BTSync's web interface using their unofficial
   API
 email: