virtualfs 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703711241692de6a7201ae001bab30b00e8070f1
-  data.tar.gz: 5db6a7b36e30539a01147940413c425b1b3fa4c0
+  metadata.gz: ddf74d9c585a8c3f4cd93dd43ad9ce9726c25b25
+  data.tar.gz: c9c80761fb9b6b7d81e5fb7e26761c0361e7bd04
 SHA512:
-  metadata.gz: 69476edb0074a9b52af53c6210fc322bb4b3b665d1da5ef7ccc788688a6b6cd099b301bb9d0a3d74a6b82f078075d551a0fdbfdeb46b1024804b0783b8658116
-  data.tar.gz: 16d6af20195c5127b3ea291f641fda526363bd59cba5839c0a4db764b96ba713652f87dc1f5cfe1ffe7828dc7d28d4c0f21fcc17dc99e5c1bc4db6e34e92c9a6
+  metadata.gz: ee8ebd0a95c9755bbc153a52bde5466b4fb4e07041a1a311c4770ccd70ace6ae65e229e482a50f51fb17b3efdbce94fb235134c240ddcdc974a474e11f4434db
+  data.tar.gz: 45e203efae0e098ee357b4a8c13dee65aa390d1616eb6e9f8d994e0ebcd9302da99f6f4581c09af76ec0c74c220df5fe56bc9e5f913ad3fdcfb8e66a77b0c842

data/Gemfile.lock

@@ -3,45 +3,31 @@ PATH
   specs:
     virtualfs (0.1.4)
       dalli (~> 2.7)
-      github_api (~> 0.8.0)
-      unicode (~> 0.4.4)
+      octokit (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.6)
     dalli (2.7.2)
-    diff-lcs (1.1.3)
-    fakefs (0.4.2)
-    faraday (0.8.5)
-      multipart-post (~> 1.1)
-    github_api (0.8.11)
-      faraday (~> 0.8.1)
-      hashie (~> 1.2.0)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (1.2.0)
-    jwt (1.2.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (1.1.5)
-    nokogiri (1.5.6)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.0)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    unicode (0.4.4.2)
+    diff-lcs (1.2.5)
+    fakefs (0.6.4)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    multipart-post (2.0.0)
+    octokit (3.7.0)
+      sawyer (~> 0.6.0, >= 0.5.3)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+    sawyer (0.6.0)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
 
 PLATFORMS
   ruby

data/lib/virtualfs/dalli_cache.rb

@@ -14,8 +14,12 @@ module VirtualFS
     end
 
     def cache(key, &proc)
-      value = yield
-      return @client.get(key) unless @client.add(key, value)
+      value = @client.get(key)
+
+      unless value
+        value = yield
+        @client.set(key, value)
+      end
 
       value
     end

data/lib/virtualfs/github.rb

@@ -2,8 +2,7 @@ require 'virtualfs/backend'
 
 require 'base64'
 require 'stringio'
-require 'unicode'
-require 'github_api'
+require 'octokit'
 
 module VirtualFS
   class Github < Backend
@@ -15,8 +14,10 @@ module VirtualFS
       @user = opts.fetch(:user)
       @repo = opts.fetch(:repo)
       @branch = opts.fetch(:branch, 'master')
+      auth = opts[:authentication]
 
-      @gh = ::Github::GitData.new(opts)
+      # @gh = ::Github::GitData.new(opts)
+      @gh = Octokit::Client.new(auth)
     end
 
     def entries(path='/')
@@ -47,15 +48,11 @@ module VirtualFS
 
     alias_method :[], :glob
 
-  private
+    private
 
     def internal_items
       cache do
-        @gh.trees.get(@user, @repo, @branch, :recursive => true).tree.reduce({}) do |hash, item|
-          # Handle decomposed UTF-8 in Github's response
-          item.path = fix_utf8(item.path)
-
-          # Make a hash
+        @gh.tree("#{@user}/#{@repo}", @branch, :recursive => true).tree.reduce({}) do |hash, item|
           hash[item.path] = item
           hash
         end
@@ -72,12 +69,8 @@ module VirtualFS
 
     def internal_blob(sha)
       cache do
-        Base64.decode64 @gh.blobs.get(@user, @repo, sha).content
+        Base64.decode64 @gh.blob("#{@user}/#{@repo}", sha).content
       end
     end
-
-    def fix_utf8(string)
-      Unicode::normalize_C(string)
-    end
   end
-end
+end

data/lib/virtualfs/version.rb

@@ -1,3 +1,3 @@
 module VirtualFS
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/virtualfs.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |gem|
   gem.version       = VirtualFS::VERSION
   gem.license       = 'MIT'
 
-  gem.add_dependency 'github_api', '~> 0.8.0'
-  gem.add_dependency 'unicode', '~> 0.4.4'
+  gem.add_dependency 'octokit', '~> 3.0'
   gem.add_dependency 'dalli', '~> 2.7'
 
   gem.add_development_dependency 'rspec', '~> 2.12'

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: virtualfs
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rafał Hirsz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: unicode
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement