BtSync 0.2.1 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODYwZWQyNTQ5MmY5ZTk0MWU3YWM1MTYwYmM0ZjVkNjY0MDI1MTUxZg==
+    ZjkwYWYyMzIyODEwNjViYmE3MDNhZTBkM2JkNjU5Zjk1YWMzMzdmMg==
   data.tar.gz: !binary |-
-    ZmRkODRiNDAxMGZiN2Q5N2UyNTk2NjFiNTExN2Q0ZDIwNGNjMTkxYw==
+    NTBlZDBlMDk4N2EyZjc3N2E2MzdmNDJlYTRlODBmMGZlNDc1ZGMzNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWQ3ZjcxZDc0NWFmODBiYjYwYmQzNmM3N2M2NGIxZGYyODc4OTcxYjNjZjI0
-    MWE5Y2E5NmY2ZTNhMjNhNjRkNzc4NmM1OTUyYTBhYTU0ZjUzZjM0NWFmMGIw
-    NjQwY2Q2NDE5ZDVlNDI2ZTNmMThjNDJjYTNmNWMzN2NiY2E1OWY=
+    NDNjNDUzYmYyNjBhZTczYWY5NTQ4YWVhM2UxYzBhNmRkNmEyNTVkY2UzYmMx
+    ZDMyMzk2ZGNkOTYxYTRkYzNjODQ4ODc3NTU5NzIyMmRkMzZmZWZhYTY5MGQ3
+    OGFhMjZmODQzZGQzMWVjM2Q1MmYzNTg0MWZiMTBhYTVhMmQ5OTQ=
   data.tar.gz: !binary |-
-    OTFjNjFmNmJjNmY5MmJhZmM1ODMwMTkzYTllODhlZmQyMjZlYmJkNzhlMGRj
-    ZTY4OWViODMyNzNmMTdlMDQ0MzlmY2EwYjI2NzI1ZTcyNmZmZmUzMTE0YTcx
-    OGMwZjQxM2YyNDcwNWUzOGJkNTVmOTJlNGZmZWUzM2IwNjBiNDg=
+    YWEyZDNjNjIzYWFkZWQxNTE1NTU5NTEyMDFmYTgzMjIwNzVmYjYxODM4Yzgz
+    M2RlZGVkYjM4YzA4ZWQ0OTdmYzEyZjNhNzYwMWYzOWFlMDY1YmIxZWNkMDk3
+    MjU0YTNjNjNiMmU4NTQzMjkzZDQwODA5Y2Q1ZjZiMzAxOTI2YzA=

data/lib/btsync.rb

@@ -1,9 +1,14 @@
 require 'httparty'
+lib = File.expand_path('../btsync', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'communicator'
 
 class BtSync
+  include BtCommunicator
   include HTTParty
   default_params :output => 'json'
-  debug_output
+
   def initialize uri=nil, port=nil
     @uri = uri
     @port = port
@@ -16,7 +21,12 @@ class BtSync
     errors
   end
   def get_folders
-    get_folder_list["folders"]
+    f = get_folder_list["folders"]
+    folders = []
+    f.each do |folder|
+      folders << Directory.new(folder["name"], folder["secret"])
+    end
+    folders
   end
   def get_speed
     s = get_folder_list["speed"].split(", ")
@@ -27,7 +37,6 @@ class BtSync
   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
@@ -37,64 +46,9 @@ class BtSync
       @errors << res["message"]
       return false
     end
-    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"]
@@ -111,11 +65,7 @@ class BtSync
     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"]
@@ -126,67 +76,114 @@ class BtSync
     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"]
+    f = get_folders.select{|folder| folder.name == with_dir}.first
+    f.secret
   end
   private
-  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
-  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
-    @port ||= '8888'
-  end
-  def uri
-    @uri ||= "http://localhost"
-  end
-  def token force = false
-    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_cache = time
-    end
-    @cookies = nil if force
-    @token
-  end
-  def cookies
-    @cookies ||= request_token.headers["set-cookie"].split("; ")[0]
-  end
-  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
+  class Directory
+    include HTTParty
+    include BtCommunicator
+    default_params :output => 'json'
+
+    attr_reader :secret, :name
+
+    def initialize name, secret
+      @name = name
+      @secret = secret
+      @errors = []
+    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 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
-  end
-  def path action_name
-    "#{uri}:#{port}/gui/?token=#{token}&action=#{action_name}"
   end
 end

data/lib/btsync/communicator.rb

@@ -0,0 +1,36 @@
+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'
+  end
+  def uri
+    @uri ||= "http://localhost"
+  end
+  def token force = false
+    @token_cache ||= 0
+    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_cache = time
+    end
+    @cookies = nil if force
+    @token
+  end
+  def cookies
+    @cookies ||= request_token.headers["set-cookie"].split("; ")[0]
+  end
+  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}"
+  end
+end

data/lib/btsync/version.rb

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

data/spec/BtSync/bt_sync_spec.rb

@@ -11,7 +11,7 @@ describe 'BtSync' do
     VCR.use_cassette("get-folders") do
       @folder = @bt.get_folders.first
     end
-    @folder["name"].should == "/home/chris/Documents"
+    @folder.name.should == "/home/chris/Documents"
   end
   it "can view settings" do
     VCR.use_cassette("get-settings") do
@@ -40,7 +40,7 @@ describe 'BtSync' do
       folders = @bt.get_folders
       folders.count.should == 2
       folder = folders.last
-      folder["name"].should == "/home/chris/bt_test"
+      folder.name.should == "/home/chris/bt_test"
     end
     VCR.use_cassette("remove-folder") do
       @bt.remove_folder '/home/chris/bt_test'
@@ -49,7 +49,7 @@ describe 'BtSync' do
       folders = @bt.get_folders
       folders.count.should == 1
       folder = folders.last
-      folder["name"].should == "/home/chris/Documents"
+      folder.name.should == "/home/chris/Documents"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BtSync
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Chris MacNaughton
@@ -111,6 +111,7 @@ files:
 - Rakefile
 - btsync.gemspec
 - lib/btsync.rb
+- lib/btsync/communicator.rb
 - lib/btsync/version.rb
 - spec/BtSync/bt_sync_spec.rb
 - spec/fixtures/cassettes/add-folder-list.yml