geminabox 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29caab70af6b8cc64c9bf3ed4f0ef14fc55fdbe5
-  data.tar.gz: 52f389d19e17a11eaab222efeb999cc7cbd792e3
+  metadata.gz: c4ac549590ede2aeb9d605ac81ba846ddc438695
+  data.tar.gz: d1903411bd32ff98a23860e2682d8cb7d116b0b5
 SHA512:
-  metadata.gz: 3c40834351d3cd2d1312c3accd677c85d86492cc8f14d1628440902c290f9ea59a46fe32452e8c346ac0a314cd04488471b9adf994f33c352a8c3fadf54de5ea
-  data.tar.gz: 58c88a1009a4843f64a0230ceb256aa33925f71a909405734dd62fe513776d8ae48612372f01a61cbed65989b69569e7bf51ac951f86f269496ab58dc9ce67d7
+  metadata.gz: e2b4f9d4fd738df563c7bb23c69d31e948277c5a837ad48ee3314344abbc263ac3fe4f4c143f1e278dac3a74ad5d9521482b8bfb11f719ce330504ebeef3ade2
+  data.tar.gz: 3fc4e817794baa910941c07365bf807897cd6fcf871073e279c941e2fc23289c1ee8de78ac84cb5b8843328c3f82c4c79e4023cd9fc55f6533acf3c800ba9954

data/{README.markdown → README.md}

@@ -12,10 +12,7 @@ For basic auth, try [Rack::Auth](http://www.rubydoc.info/github/rack/rack/Rack/A
 
 ## System Requirements
 
-    Tested on Mac OS X 10.8.2
-    Ruby 1.9.3-392
-
-    Tests fail on Ruby 2.0.0-p0
+See [.travis.yml](./.travis.yml) for supported ruby versions
 
 ## Server Setup
 
@@ -157,10 +154,8 @@ Your server should now be running!
 
 ## Licence
 
-Fork it, mod it, choose it, use it, make it better. All under the MIT License.
+[MIT_LICENSE](./MIT-LICENSE)
+
+## ChangeLog
 
-[WTFBPPL]: http://tomlea.co.uk/WTFBPPL.txt
-[sinatra]: http://www.sinatrarb.com/
-[passenger]: http://www.modrails.com/
-[thin]: http://code.macournoyer.com/thin/
-[unicorn]: http://unicorn.bogomips.org/
+[CHANGELOG.md](./CHANGELOG.md)

data/lib/geminabox.rb

@@ -51,7 +51,8 @@ module Geminabox
       :retry_interval,
       :allow_remote_failure,
       :ruby_gems_url,
-      :bundler_ruby_gems_url
+      :bundler_ruby_gems_url,
+      :allow_upload
     )
 
     def set_defaults(defaults)
@@ -85,7 +86,8 @@ module Geminabox
     retry_interval:        60,
     allow_remote_failure:  false,
     ruby_gems_url:         'https://rubygems.org/',
-    bundler_ruby_gems_url: 'https://bundler.rubygems.org/'
+    bundler_ruby_gems_url: 'https://bundler.rubygems.org/',
+    allow_upload:          true
   )
     
 end

data/lib/geminabox/gem_store.rb

@@ -37,7 +37,7 @@ module Geminabox
         if existing_file_digest != gem.hexdigest
           raise GemStoreError.new(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
         else
-          raise GemStoreError.new(200, "Ignoring upload, you uploaded the same thing previously.\nPlease use -o to ovewrite.")
+          raise GemStoreError.new(200, "Ignoring upload, you uploaded the same thing previously.\nPlease use -o to overwrite.")
         end
       end
     end

data/lib/geminabox/proxy/file_handler.rb

@@ -9,7 +9,7 @@ module Geminabox
         @file_name = file_name
         ensure_destination_exists
       end
-      
+
       def local_path
         File.expand_path(file_name, root_path)
       end
@@ -21,7 +21,7 @@ module Geminabox
       def local_file_exists?
         file_exists? local_path
       end
-      
+
       def proxy_file_exists?
         file_exists? proxy_path
       end

data/lib/geminabox/proxy/hostess.rb

@@ -5,7 +5,6 @@ module Geminabox
   module Proxy
     class Hostess < Sinatra::Base
       attr_accessor :file_handler
-      
       def serve
         if file_handler
           send_file file_handler.proxy_path

data/lib/geminabox/proxy/splicer.rb

@@ -1,8 +1,9 @@
+require 'tempfile'
 
 module Geminabox
   module Proxy
     class Splicer < FileHandler
-      
+
       def self.make(file_name)
         splicer = new(file_name)
         splicer.create
@@ -10,7 +11,16 @@ module Geminabox
       end
 
       def create
-        File.open(splice_path, 'w'){|f| f.write(new_content)}
+        data = new_content
+        return nil if data.nil?
+        begin
+          tmp = Tempfile.new('geminabox')
+          File.open(tmp, 'w'){|f| f.write(data)}
+        rescue
+          return nil
+        end
+
+        FileUtils.mv tmp, splice_path
       end
 
       def new_content

data/lib/geminabox/server.rb

@@ -19,7 +19,8 @@ module Geminabox
       :lockfile,
       :retry_interval,
       :rubygems_proxy,
-      :ruby_gems_url
+      :ruby_gems_url,
+      :allow_upload
     )
 
     if Server.rubygems_proxy
@@ -37,6 +38,10 @@ module Geminabox
         allow_delete
       end
 
+      def allow_upload?
+        allow_upload
+      end
+
       def fixup_bundler_rubygems!
         return if @post_reset_hook_applied
         Gem.post_reset{ Gem::Specification.all = nil } if defined? Bundler and Gem.respond_to? :post_reset
@@ -85,6 +90,8 @@ module Geminabox
     get '/' do
       @gems = load_gems
       @index_gems = index_gems(@gems)
+      @allow_upload = self.class.allow_upload?
+      @allow_delete = self.class.allow_delete?
       erb :index
     end
 
@@ -102,6 +109,10 @@ module Geminabox
     end
 
     get '/upload' do
+      unless self.class.allow_upload?
+        error_response(403, 'Gem uploading is disabled')
+      end
+
       erb :upload
     end
 
@@ -133,6 +144,10 @@ module Geminabox
     end
 
     post '/upload' do
+      unless self.class.allow_upload?
+        error_response(403, 'Gem uploading is disabled')
+      end
+
       if params[:file] && params[:file][:filename] && (tmpfile = params[:file][:tempfile])
         serialize_update do
           handle_incoming_gem(Geminabox::IncomingGem.new(tmpfile))
@@ -144,6 +159,10 @@ module Geminabox
     end
 
     post '/api/v1/gems' do
+      unless self.class.allow_upload?
+        error_response(403, 'Gem uploading is disabled')
+      end
+
       begin
         serialize_update do
           handle_incoming_gem(Geminabox::IncomingGem.new(request.body))

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '0.13.1' unless defined? VERSION
+  VERSION = '0.13.2' unless defined? VERSION
 end

data/views/index.erb

@@ -3,12 +3,14 @@
   <pre><code>gem sources -a <%= url "/" %></code></pre>
 <small>If you needed some credentials to get to this page</small>
   <pre><code>gem sources -a <%= url.to_s.gsub('://','://username:password@') %></code></pre>
+<% if @allow_upload %>
 <small>and then ...</small>
   <pre><code>gem install geminabox<br />gem inabox [gemfile]</code></pre>
+<% end %>
 </p>
 
 <% if @gems.any? %>
-  <a href="<%= url("/upload") %>">Upload Another Gem</a>
+  <% if @allow_upload %><a href="<%= url("/upload") %>">Upload Another Gem</a><% end %>
 
   <div id="alpha_index"><%= ("a".."z").map{|i| @index_gems.include?(i) ? "<a href='#jump_#{i}'>#{i}</a>" : i }.join(" - ") %></div>
 
@@ -26,8 +28,10 @@
           </p>
           <form class="delete-form" method="post" action="<%= url("/gems/#{version.gemfile_name}.gem") %>">
             <a class="download" href="<%= url("/gems/#{version.gemfile_name}.gem") %>">download</a>
+            <% if @allow_delete %>
             <input type="hidden" name="_method" value="DELETE" />
             <button type="submit">delete</button>
+            <% end %>
           </form>
         <% end %>
 
@@ -53,4 +57,4 @@
   </ul>
 <% end %>
 
-<a href="<%= url("/upload") %>">Upload Another Gem</a>
+<% if @allow_upload %><a href="<%= url("/upload") %>">Upload Another Gem</a><% end %>

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Tom Lea
 - Jack Foy
 - Rob Nichols
+- Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -87,13 +88,14 @@ email:
 - contrib@tomlea.co.uk
 - jack@foys.net
 - rob@undervale.co.uk
+- sonots@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.markdown
+- README.md
 files:
 - MIT-LICENSE
-- README.markdown
+- README.md
 - lib/geminabox.rb
 - lib/geminabox/disk_cache.rb
 - lib/geminabox/gem_list_merge.rb
@@ -135,7 +137,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.markdown
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement