berkshelf-store 0.3.0 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    berkshelf-store (0.3.0)
+    berkshelf-store (0.3.1)
       ridley
       sinatra (>= 1.4.5)
       sinatra-contrib (>= 1.4.2)

data/README.md

@@ -1,10 +1,10 @@
-berkshelf-store
-===============
+# berkshelf-store [![Gem Version](https://badge.fury.io/rb/berkshelf-store.svg)](http://badge.fury.io/rb/berkshelf-store)
+
 
 A cookbook store compatible with berkshelf API.
 
 Currently it is a simple webservice :
-* POST /v1/cookbooks/$Name/$Version
+* POST /v1/cookbooks
  * cookbook param contains tgz
 * GET /v1/universe
  * this is berkshelf API
@@ -71,9 +71,9 @@ bash style :
 
     curl -F cookbook=@/path/to/the/cookbook.tgz http://localhost/v1/cookbooks
 
-    #or if your are in the cookbook :
+    #or if you have a cookbook_dir :
 
-    tar cvzf - . | curl -F cookbook=@- http://localhost/v1/cookbooks
+    tar cvzf - cookbook_dir | curl -F cookbook=@- http://localhost/v1/cookbooks
 
 or by UI:
 

data/lib/berkshelf-store.rb

@@ -1,6 +1,6 @@
 module BerkshelfStore
   ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
   autoload :Backends, 'berkshelf-store/backends'
   autoload :Webservice, 'berkshelf-store/webservice'
 end

data/lib/berkshelf-store/backends/filesystem.rb

@@ -39,9 +39,9 @@ module BerkshelfStore::Backends
       end
   
       #locate check cookbook
-      search_root = Dir["#{tmp_dir}/cookbook/*/metadata.rb", "#{tmp_dir}/cookbook/metadata.rb"]
+      search_root = Dir["#{tmp_dir}/cookbook/*/metadata.rb"]
       if search_root.size != 1
-        return {"fail" => "tgz don't contains one and only on */metadata.rb"}
+        return {"fail" => "tgz needs to contain ./a_dir/metadata.rb"}
       end
       cookbook_dir = File.dirname(search_root[0])
         

data/test/test_berkshelf-store_backends_filesystem.rb

@@ -21,7 +21,7 @@ class BerkshelfRepoBackendsFilesystemTest < Test::Unit::TestCase
     @test_case[:apache2_1_10_4] = Hash.new
     @test_case[:apache2_1_10_4][:name] = 'apache2'
     @test_case[:apache2_1_10_4][:version] = '1.10.4'
-    @test_case[:apache2_1_10_4][:content] = File.read("#{@tarballs}/apache2-v1.10.4-nosubdir.tar.gz")
+    @test_case[:apache2_1_10_4][:content] = File.read("#{@tarballs}/apache2-v1.10.4.tar.gz")
     @test_case[:apache2_1_10_4][:json] = File.read("#{@dataarbo}/cookbooks/apache2/1.10.4/data.json")
   end
 

data/ui/views/doc.erb

@@ -2,7 +2,7 @@
 <h2>Berkshelf</h2>
 Use this service as Berkshelf source :
 <pre>
-source "<%=@site_prefix%><%=@ws_prefix%>/universe"
+source "<%=@site_prefix%><%=@ws_prefix%>"
 </pre>
 <h2>Load cookbooks</h2>
 <h3>by api</h3>
@@ -15,13 +15,13 @@ with tgz content in "cookbook" param
 <pre>
 curl -F cookbook=@/path/to/the/cookbook.tgz <%=@site_prefix%><%=@ws_prefix%>/cookbooks
 </pre>
-or if you are in the workdir
+or if you have the cookbook dir
 <pre>
-tar cvzf - . | curl -F cookbook=@- <%=@site_prefix%><%=@ws_prefix%>/cookbooks
+tar cvzf - cookbook_dir | curl -F cookbook=@- <%=@site_prefix%><%=@ws_prefix%>/cookbooks
 </pre>
 free trick : copy a cookbook from opscode... in bash
 <pre>
-curl -L http://community.opscode.com/cookbooks/$cookbook/versions/${version//./_}/downloads | curl -F cookbook=@- <%=@site_prefix%><%=@ws_prefix%>/cookbooks
+curl -L http://community.opscode.com/cookbooks/$COOKBOOK/versions/$VERSION/downloads | curl -F cookbook=@- <%=@site_prefix%><%=@ws_prefix%>/cookbooks
 </pre>
 <h3>by upload form</h3>
 <a href="upload.html">Upload page</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-store
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syslog-logger
-  requirement: &3885700 !ruby/object:Gem::Requirement
+  requirement: &5848320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3885700
+  version_requirements: *5848320
 - !ruby/object:Gem::Dependency
   name: ridley
-  requirement: &3885160 !ruby/object:Gem::Requirement
+  requirement: &5845080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3885160
+  version_requirements: *5845080
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &3884340 !ruby/object:Gem::Requirement
+  requirement: &5858500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *3884340
+  version_requirements: *5858500
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &3883560 !ruby/object:Gem::Requirement
+  requirement: &5856860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *3883560
+  version_requirements: *5856860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3882960 !ruby/object:Gem::Requirement
+  requirement: &5856160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3882960
+  version_requirements: *5856160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &3882280 !ruby/object:Gem::Requirement
+  requirement: &5855140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3882280
+  version_requirements: *5855140
 description: A cookbook store based on the berkshelf API
 email:
 - github.guillaume@zitta.fr