BtSync 0.5.1 → 0.5.3

data/cookbooks/build-essential/recipes/smartos.rb

@@ -0,0 +1,36 @@
+#
+# Cookbook Name:: build-essential
+# Recipe:: smartos
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'pkgin'
+
+%w{
+  gcc47
+  gcc47-runtime
+  scmgit-base
+  gmake
+  pkg-config
+  binutils
+}.each do |pkg|
+
+  r = pkgin_package pkg do
+    action( node['build_essential']['compiletime'] ? :nothing : :install )
+  end
+  r.run_action(:install) if node['build_essential']['compiletime']
+
+end

data/cookbooks/build-essential/recipes/solaris2.rb

@@ -0,0 +1,42 @@
+#
+# Cookbook Name:: build-essential
+# Recipe:: solaris2
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+%w{
+  autoconf
+  automake
+  bison
+  coreutils
+  flex
+  gcc4core
+  gcc4g++
+  gcc4objc
+  gcc3core
+  gcc3g++
+  ggrep
+  gmake
+  gtar
+  pkgconfig
+}.each do |pkg|
+
+  r = pkgutil_package pkg do
+    action( node['build_essential']['compiletime'] ? :nothing : :install )
+  end
+  r.run_action(:install) if node['build_essential']['compiletime']
+
+end

data/cookbooks/build-essential/recipes/suse.rb

@@ -0,0 +1,36 @@
+#
+# Cookbook Name:: build-essential
+# Recipe:: suse
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+%w{
+  autoconf
+  bison
+  flex
+  gcc
+  gcc-c++
+  kernel-default-devel
+  make
+  m4
+}.each do |pkg|
+
+  r = package pkg do
+    action( node['build_essential']['compiletime'] ? :nothing : :install )
+  end
+  r.run_action(:install) if node['build_essential']['compiletime']
+
+end

data/lib/btsync.rb

@@ -14,8 +14,8 @@ class BtSync
       :protocol => "http",
       :uri => "localhost",
       :port => "8888",
-      :user => "",
-      :password => ""}
+      :user => "admin",
+      :password => "AdminPassword"}
     @opts.merge!(options.symbolize)
     @opts[:uri].gsub!(/^(https?:\/\/){1,}/i, '')
     @port =  @opts[:port]
@@ -64,7 +64,7 @@ class BtSync
   def change_setting type, opt
     options = get_settings.merge!({type => opt})
 
-    res = self.class.get(path('setsettings'), :query => options, :headers => {"Cookie" => cookies })
+    res = get(path('setsettings'), :query => options)
   end
   def get_speed
     s = get_folder_list["speed"].split(", ")
@@ -74,12 +74,12 @@ class BtSync
   end
   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})
+    res = get(path('removefolder'), :query => { :name => folder_name, :secret => my_secret})
     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})
+    res = get(path('addsyncfolder'), :query => { :name => folder_name, :secret => my_secret})
     unless res["error"] == 0
       @errors << res["message"]
       return false
@@ -88,25 +88,25 @@ class BtSync
   end
 
   def get_settings
-    res = self.class.get(path('getsettings'), :headers => {"Cookie" => cookies })
+    res = get(path('getsettings'))
     res.parsed_response["settings"]
   end
   def get_os_type
-    res = self.class.get(path('getostype'), :headers => {"Cookie" => cookies })
+    res = get(path('getostype'))
     res.parsed_response["os"]
   end
   def get_version
-    res = self.class.get(path('getversion'), :headers => {"Cookie" => cookies })
+    res = get(path('getversion'))
     res.parsed_response["version"]
   end
   def check_new_version
-    res = self.class.get(path('checknewversion'), :headers => {"Cookie" => cookies })
+    res = get(path('checknewversion'))
     res.parsed_response["version"]
   end
 
-  def get_dir with_dir
-    res = self.class.get(path('getdir'), :query => {:dir => with_dir}, :headers => {"Cookie" => cookies })
-    res.parsed_response["folders"]
+  def get_dir with_dir = "/"
+    res = get(path('getdir'), :query => {"dir" => with_dir})
+    res.parsed_response["folders"].map{|f| f.gsub!('//', '/')}
   end
 
   def secret with_dir
@@ -116,7 +116,7 @@ class BtSync
   private
 
   def get_folder_list
-    res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
+    res = get(path('getsyncfolders'))
     @folder_list = res.parsed_response
   end
 end

data/lib/btsync/communicator.rb

@@ -1,8 +1,9 @@
 module BtCommunicator
   include HTTParty
-
+  disable_rails_query_string_format
+  default_params :output => 'json'
   def generate_secret
-    res = self.class.get(path('generatesecret'), :headers => {"Cookie" => cookies })
+    res = get(path('generatesecret'))
     res.parsed_response["secret"]
   end
   def port
@@ -23,6 +24,9 @@ module BtCommunicator
   def communication_options
     @opts
   end
+  def auth
+    {:username => user, :password => password}
+  end
   def token force = false
     @token_cache ||= 0
     time = DateTime.now.strftime("%s").to_i
@@ -39,18 +43,24 @@ module BtCommunicator
   def root_url
     "#{starter}#{uri}:#{port}/"
   end
+
+  def get path, opts = {}
+    opts = {:headers=>{"Cookie" => cookies}, :query => {}, :basic_auth => auth}.merge(opts)
+    self.class.get(path, opts)
+  end
+
   def request_token force = false
     @last_request ||= 0
     t = DateTime.now.strftime('%s').to_i
     if @request_token.nil? || force || (@last_request + 600) < t
       @last_request = t
-      @request_token = self.class.get("#{root_url}gui/token.html", :query => {:output => :text})
+      @request_token = self.class.get("#{root_url}gui/token.html", :basic_auth => auth)
     else
       @request_token
     end
   end
   def starter
-    "#{protocol}://#{user}:#{password}@"
+    "#{protocol}://"
   end
   def path action_name
     "#{root_url}gui/?token=#{token}&action=#{action_name}"

data/lib/btsync/directory.rb

@@ -17,12 +17,12 @@ class BtSync
     end
 
     def destroy
-      self.class.get(path('removefolder'), :query => { :name => name, :secret => secret}, :headers => {"Cookie" => cookies})
+      get(path('removefolder'), :query => { :name => name, :secret => secret} )
       self.instance_variables.each{|v| v = nil}
     end
     def update_secret new_secret = nil
       new_secret ||= generate_secret
-      res = self.class.get(path('updatesecret'), :query => { :name => @name, :secret =>  @secret, :newsecret => new_secret}, :headers => {"Cookie" => cookies})
+      res = get(path('updatesecret'), :query => { :name => @name, :secret =>  @secret, :newsecret => new_secret} )
       if res.parsed_response != "{}" && res.parsed_response != '\r\ninvalid request'
         @secret = new_secret
         true
@@ -32,26 +32,26 @@ class BtSync
       end
     end
     def folders
-      res = self.class.get(path('getdir'), :query => {:dir => @name}, :headers => {"Cookie" => cookies })
+      res = get(path('getdir'), :query => {:dir => @name})
       res.parsed_response["folders"]
     end
     def peers
-      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
+      res = get(path('getsyncfolders') )
       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 = get(path('getknownhosts'), :query => {:name => name, :secret => secret})
       hosts = {}
       res["hosts"].map{|h| hosts[h["index"]] = h["peer"]}
       hosts
     end
     def add_host host, port
-      res = self.class.get(path('addknownhosts'), :query =>{:name => name, :secret => secret, :addr =>host, :port => port}, :headers => {"Cookie" => cookies })
+      res = get(path('addknownhosts'), :query =>{:name => name, :secret => secret, :addr =>host, :port => port} )
       true
     end
     def remove_host index
-      res = self.class.get(path('removeknownhosts'), :query =>{:name => name, :secret => secret, :index => index}, :headers => {"Cookie" => cookies })
+      res = get(path('removeknownhosts'), :query =>{:name => name, :secret => secret, :index => index} )
       if res.parsed_response != {}
         res.parsed_response
       else
@@ -101,7 +101,7 @@ class BtSync
       bool(preferences["iswritable"])
     end
     def preferences
-      res = self.class.get(path('getfolderpref'), :query => { :name => @name, :secret => @secret}, :headers => {"Cookie" => cookies})
+      res = get(path('getfolderpref'), :query => { :name => @name, :secret => @secret})
       res.parsed_response["folderpref"]
     end
     def read_only_secret
@@ -109,7 +109,7 @@ class BtSync
     end
     private
     def set_pref pref, opt
-      res = self.class.get(path('setfolderpref'), :query => make_opts(pref, opt), :headers => {"Cookie" => cookies })
+      res = get(path('setfolderpref'), :query => make_opts(pref, opt) )
       true
     end
     def default_settings
@@ -123,7 +123,7 @@ class BtSync
         'deletetotrash' => 1,
         'usehosts' => 1
       }
-      self.class.get(path('setfolderpref'), :query => opts, :headers => {"Cookie" => cookies })
+      get(path('setfolderpref'), :query => opts )
     end
     def make_opts name, opt
      opts = preferences
@@ -148,12 +148,12 @@ class BtSync
       end
     end
     def find_or_create
-      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
+      res = get(path('getsyncfolders'))
       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})
+        res = get(path('addsyncfolder'), :query => { :name => name, :secret => secret})
       end
     end
   end

data/lib/btsync/version.rb

@@ -1,3 +1,3 @@
 module BtsyncVersion
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/spec/BtSync/bt_sync_spec.rb

@@ -4,6 +4,10 @@ describe 'BtSync' do
   before(:each) do
     VCR.use_cassette("Setup-BtSync") do
       @bt = BtSync.new
+      @bt.add_folder '/home/vagrant'
+      @bt.listening_port = 63754
+      @bt.upload_limit = 0
+      @bt.device_name = "precise32 - Default Instance"
     end
   end
 
@@ -11,13 +15,13 @@ describe 'BtSync' do
     VCR.use_cassette("get-folders") do
       @folder = @bt.folders.first
     end
-    @folder.name.should == "/home/chris/Documents"
+    @folder.name.should == "/home/vagrant"
   end
   it "can view settings" do
     VCR.use_cassette("get-settings") do
       @settings = @bt.get_settings
     end
-    @settings["devicename"].should == "IceyEC-Virtual1"
+    @settings["devicename"].should == "precise32 - Default Instance"
     @settings["listeningport"].should == 63754
   end
   it "can get listening port" do
@@ -37,7 +41,7 @@ describe 'BtSync' do
   end
   it "can get device name" do
     VCR.use_cassette("get-settings") do
-      @bt.device_name.should == "IceyEC-Virtual1"
+      @bt.device_name.should == "precise32 - Default Instance"
     end
   end
   it "can change the device_name" do
@@ -46,8 +50,8 @@ describe 'BtSync' do
       @bt.device_name.should == "IceyEC-Virtual2"
     end
     VCR.use_cassette('reset_device_name') do
-      @bt.device_name = "IceyEC-Virtual1"
-      @bt.device_name.should == "IceyEC-Virtual1"
+      @bt.device_name = "precise32 - Default Instance"
+      @bt.device_name.should == "precise32 - Default Instance"
     end
   end
   it "can change the upload limit" do
@@ -94,22 +98,22 @@ describe 'BtSync' do
   end
   it "can add and delete a folder" do
     VCR.use_cassette("add-folder") do
-      @bt.add_folder '/home/chris/bt_test'
+      @bt.add_folder '/tmp'
     end
     VCR.use_cassette("add-folder-list") do
       folders = @bt.folders
       folders.count.should == 2
       folder = folders.last
-      folder.name.should == "/home/chris/bt_test"
+      folder.name.should == "/tmp"
     end
     VCR.use_cassette("remove-folder") do
-      @bt.remove_folder '/home/chris/bt_test'
+      @bt.remove_folder '/tmp'
     end
     VCR.use_cassette("remove-folder-list") do
       folders = @bt.folders
       folders.count.should == 1
       folder = folders.last
-      folder.name.should == "/home/chris/Documents"
+      folder.name.should == "/home/vagrant"
     end
   end
 end

data/spec/BtSync/directory_spec.rb

@@ -4,51 +4,44 @@ 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)
+      @bt.add_folder '/home/vagrant'
+      @bt.listening_port = 63754
+      @bt.upload_limit = 0
+      @bt.device_name = "precise32 - Default Instance"
+      @directory = @bt.folders.first
     end
     VCR.use_cassette('Setup-Directory-Settings') do
-      @bt = BtSync.new
-      @directory = BtSync::Directory.new(
-        '/home/chris/Documents',
-        '6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ',
-        @bt)
       @directory.send('default_settings')
+      @directory.add_host('192.168.1.5','45685')
     end
   end
   after(:each) do
     VCR.use_cassette('Setup-Directory-Settings') do
       @directory.send('default_settings')
     end
+    VCR.use_cassette('Remove-Default-Host') do
+      @directory.remove_host 0
+    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"
+    @folders.should == []
   end
   it "can get a list of peers" do
     VCR.use_cassette("get-peers") do
       @peers = @directory.peers
     end
-    @peers.first.should == {"direct"=>1, "name"=>"IceyEC Portable", "status"=>"Synced on 06/05/13 20:52:35"}
+    @peers.should == []
   end
-  it "can get known hosts" do
-    VCR.use_cassette("get-known-hosts") do
-      @hosts = @directory.known_hosts
-    end
-    @hosts[0].should == "192.168.1.5:45685"
-  end
-  it "can add a known host" do
+  it "can add and remove a known host" do
     VCR.use_cassette('add-known-host') do
       @directory.add_host('10.0.1.254', '12345')
       @hosts = @directory.known_hosts
     end
     @hosts[1].should == "10.0.1.254:12345"
-  end
-  it "can remove a known host" do
+
     VCR.use_cassette('remove-known-host') do
       @directory.remove_host(1)
       @hosts = @directory.known_hosts