stickler 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0d0d6ef2c500168f844e051452173e22c4e1bd
-  data.tar.gz: da8a24b4c389ed71cc4d50d9cc2771275682f92c
+  metadata.gz: eca06c2dc9ce087e0c22c4d2a3651097d9672a24
+  data.tar.gz: e4e52e3a119a3bbe11c12edef99fbfcf4beff589
 SHA512:
-  metadata.gz: 167b8138cccd4ab189288417f8499a9474304c1f7124d8018aa8ba023d07a756bdee45d3422a03c2042b3c83f85c7e3adb660574aea94fbf623a798b1e902b12
-  data.tar.gz: c33eb450f6af74db9d9df8392f225c4fc958c3a003772d70ba445cbc6f971c4b9beb4f54cbaf666db363a2906b94004b02d702f7a1293cadf74f4b2c4e1cc2fe
+  metadata.gz: fd6d208cb1e233cf592d33f53a75a260823d8760208d8968475980994c00fca1705518026a46eac5f56ae33f3dab451c74af4feab3a2ad562f15fa585c0bd663
+  data.tar.gz: 3655d2b3817257f3c4e78517eef59ca55f239415395679fdbd02d4ac104f32fe0b0deff61b9078cf7f96e5baa89ea35de95f99183d204c5516cc36d4101be2ad

data/CONTRIBUTING.md

@@ -40,6 +40,8 @@ easiest way to contribute.
 * [Philip Roberts](https://github.com/latentflip)
 * [Alan Gardner](https://github.com/urfolomeus)
 * [tiago.nobre](https://github.com/macwadu)
+* [Michael Smith](https://github.com/MikaelSmith)
+* [Shenil Dodhia](https://github.com/shenil)
 
 [GitHub Account]: https://github.com/signup/free "GitHub Signup"
 [GitHub Issues]:  https://github.com/copiousfreetime/stickler/issues "Stickler Issues"

data/HISTORY.md

@@ -2,6 +2,13 @@ Stickler Changelog
 ==================
 Jeremy Hinegardner <jeremy@copiousfreetime.org>
 
+Version 2.4.2 - 2015-03-12
+--------------------------
+* Drop support for ruby 1.8
+* Update dependencies
+* Fix mirror errors when no gem-version supplied <https://github.com/copiousfreetime/stickler/issues/42>
+* Fix yank/unank of non-ruby platform gems <https://github.com/copiousfreetime/stickler/issues/45>
+
 Version 2.4.1 - 2014-06-11
 --------------------------
 * Fix daemonization bug <https://github.com/copiousfreetime/stickler/issues/38>

data/Rakefile

@@ -11,16 +11,18 @@ This.ruby_gemspec do |spec|
   spec.add_runtime_dependency( 'sinatra'    , '~> 1.4'  )
   spec.add_runtime_dependency( 'addressable', '~> 2.3'  )
   spec.add_runtime_dependency( 'excon'      , '~> 0.37' )
-  spec.add_runtime_dependency( 'trollop'    , '~> 2.0'  )
+  spec.add_runtime_dependency( 'trollop'    , '~> 2.1'  )
   spec.add_runtime_dependency( 'logging'    , '~> 1.8'  )
 
   # The Development Dependencies
-  spec.add_development_dependency( 'rake'        , '~> 10.1' )
+  spec.add_development_dependency( 'rake'        , '~> 10.4' )
   spec.add_development_dependency( 'rack-test'   , '~> 0.6'  )
   spec.add_development_dependency( 'builder'     , '~> 3.2'  )
   spec.add_development_dependency( 'minitest'    , '~> 5.0'  )
-  spec.add_development_dependency( 'rdoc'        , '~> 4.0'  )
+  spec.add_development_dependency( 'rdoc'        , '~> 4.2'  )
   spec.add_development_dependency( 'ronn'        , '~> 0.7'  )
+  spec.add_development_dependency( 'mustache'    , '~> 0.99' )
+  spec.add_development_dependency( 'simplecov'   , '~> 0.9' )
 
   spec.required_rubygems_version = '~> 2.2'
 

data/lib/stickler.rb

@@ -1,6 +1,6 @@
 module Stickler
   # The Current Version of the library
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end
 require 'sinatra/base'
 

data/lib/stickler/client/mirror.rb

@@ -34,7 +34,7 @@ _
             gem_name = p.leftovers.shift
           else
             gemfile_lock = p.leftovers.shift
-            raise Trollop::CommandlineError, "#{lock} must be readable" unless File.readable?( gemfile_lock )
+            raise Trollop::CommandlineError, "#{gemfile_lock} must be readable" unless File.readable?( gemfile_lock )
           end
         end
         opts[:gem_name]     = gem_name

data/lib/stickler/gem_container.rb

@@ -33,7 +33,7 @@ module Stickler
           Gem::Format.from_file_by_path( path )
         end
       rescue LoadError
-        abort "FAilure to load rubygems/format"
+        abort "Failure to load rubygems/format"
       end
     end
   end

data/lib/stickler/middleware/gemcutter.rb

@@ -40,7 +40,8 @@ module Stickler::Middleware
     # gemcutter unyank
     post '/api/v1/gems/unyank' do
       begin
-        spec = Stickler::SpecLite.new( params[:spec_name], params[:version] )
+        platform = params.fetch("platform", "ruby")
+        spec = Stickler::SpecLite.new( params[:spec_name], params[:version], platform )
         @repo.unyank( spec )
         logger.info( "Unyanked #{spec.full_name}" )
         return spec.to_s
@@ -52,7 +53,8 @@ module Stickler::Middleware
 
     # gemcutter yank
     delete '/api/v1/gems/yank' do
-      spec = Stickler::SpecLite.new( params[:gem_name], params[:version] )
+      platform = params.fetch("platform", "ruby")
+      spec = Stickler::SpecLite.new( params[:gem_name], params[:version], platform )
       if @repo.yank( spec ) then
         logger.info( "Yanked #{spec.full_name}" )
         return "Yanked #{spec.full_name}"

data/lib/stickler/repository/remote.rb

@@ -93,7 +93,7 @@ module ::Stickler::Repository
     #
     def yank( spec )
       return nil unless remote_gem_file_exist?( spec )
-      query = { :gem_name => spec.name, :version => spec.version.to_s }
+      query = { :gem_name => spec.name, :version => spec.version.to_s, :platform => spec.platform.to_s }
       resource_request( yank_resource, :query => query  )
       return full_uri_to_gem( spec )
     rescue Excon::Errors::Error => e
@@ -105,7 +105,7 @@ module ::Stickler::Repository
     #
     def unyank( spec )
       if remote_gem_file_exist?( spec ) && search_for( spec ).empty? then
-        query = { :spec_name => spec.name, :version => spec.version.to_s }
+        query = { :spec_name => spec.name, :version => spec.version.to_s, :platform => spec.platform.to_s }
         resource_request( unyank_resource, :query => query  )
         return true
       else

data/tasks/default.rake

@@ -10,21 +10,12 @@ namespace :develop do
 
   # Install all the development and runtime dependencies of this gem using the
   # gemspec.
-  task :default do
+  task :default => 'Gemfile' do
     require 'rubygems/dependency_installer'
     installer = ::Gem::DependencyInstaller.new
-
-    This.set_coverage_gem
-
-    puts "Installing gem depedencies needed for development"
-    This.platform_gemspec.dependencies.each do |dep|
-      if dep.matching_specs.empty? then
-        puts "Installing : #{dep}"
-        installer.install dep
-      else
-        puts "Skipping   : #{dep} -> already installed #{dep.matching_specs.first.full_name}"
-      end
-    end
+    puts "Installing bundler..."
+    installer.install 'bundler'
+    sh 'bundle install'
     puts "\n\nNow run 'rake test'"
   end
 
@@ -37,16 +28,8 @@ namespace :develop do
       f.puts 'gemspec'
     end
   end
-
-  desc "Create a bundler Gemfile"
-  task :using_bundler => 'Gemfile' do
-    puts "Now you can 'bundle'"
-  end
-
-  # Gemfiles are build artifacts
-  CLOBBER << FileList['Gemfile*']
 end
-desc "Boostrap development"
+desc "Bootstrap development"
 task :develop => "develop:default"
 
 #------------------------------------------------------------------------------
@@ -90,31 +73,16 @@ end
 # Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
 #            for the moment only rcov is listed.
 #------------------------------------------------------------------------------
-if RUBY_VERSION < "1.9.0"
-  begin
-   require 'rcov/rcovtask'
-   Rcov::RcovTask.new( 'coverage' ) do |t|
-     t.libs      << 'spec'
-     t.pattern   = 'spec/**/*_spec.rb'
-     t.verbose   = true
-     t.rcov_opts << "-x ^/"           # remove all the global files
-     t.rcov_opts << "--sort coverage" # so we see the worst files at the top
-   end
-  rescue LoadError
-   This.task_warning( 'rcov' )
-  end
-else
-  begin
-    require 'simplecov'
-    desc 'Run tests with code coverage'
-    task :coverage do
-      ENV['COVERAGE'] = 'true'
-      Rake::Task[:test].execute
-    end
-    CLOBBER << FileList["coverage"]
-  rescue LoadError
-    This.task_warning( 'simplecov' )
+begin
+  require 'simplecov'
+  desc 'Run tests with code coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task[:test].execute
   end
+  CLOBBER << 'coverage' if File.directory?( 'coverage' )
+rescue LoadError
+  This.task_warning( 'simplecov' )
 end
 
 #------------------------------------------------------------------------------
@@ -179,9 +147,10 @@ namespace :fixme do
   end
 
   def outdated_fixme_files
-    local_fixme_files.reject do |local|
+    local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+      upstream.exist? &&
+        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
     end
   end
 
@@ -231,9 +200,6 @@ task :gemspec do
   end
 end
 
-# the gemspec is also a dev artifact and should not be kept around.
-CLOBBER << This.gemspec_file.to_s
-
 # .rbc files from ruby 2.0
 CLOBBER << FileList["**/*.rbc"]
 

data/tasks/this.rb

@@ -13,7 +13,7 @@ class ThisProject
   attr_accessor :email
 
   # The homepage of this project
-  attr_accessor :homepage 
+  attr_accessor :homepage
 
   # The regex of files to exclude from the manifest
   attr_accessor :exclude_from_manifest
@@ -25,7 +25,11 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)|^[^\/]+\.gemspec|\.(swp|jar|bundle|so|rvmrc)$|~$/
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
+                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
+                                          /^[^\/]+\.gemspec/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml)$/,
+                                          /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
   end
@@ -119,7 +123,7 @@ class ThisProject
 
   # Internal: Returns the gemspace associated with the current ruby platform
   def platform_gemspec
-    gemspecs[platform]
+    gemspecs.fetch(platform) { This.ruby_gemspec }
   end
 
   def core_gemspec
@@ -141,6 +145,8 @@ class ThisProject
       spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc|md)$/)
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
+
+      spec.required_ruby_version = '>= 1.9.3'
     end
   end
 
@@ -167,20 +173,6 @@ class ThisProject
     return spec
   end
 
-  # Internal: Set the recovery gem development dependency
-  #
-  # These are dynamically set since they cannot be hard coded as there is 
-  # no way to ship them correctly in the gemspec
-  #
-  # Returns nothing.
-  def set_coverage_gem
-    if RUBY_VERSION < "1.9.0"
-      platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
-    else
-      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.8.2' )
-    end
-  end
-
   # Internal: Return the platform of ThisProject at the current moment in time.
   def platform
     (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
@@ -190,13 +182,13 @@ class ThisProject
   def description_section
     section_of( 'README.md', 'DESCRIPTION')
   end
- 
- # Internal: Return the summary text from the README 
+
+  # Internal: Return the summary text from the README
   def summary
     description_section.first
   end
 
-  # Internal: Return the full description text from the READEM
+  # Internal: Return the full description text from the README
   def description
     description_section.join(" ").tr("\n", ' ').gsub(/[{}]/,'').gsub(/\[[^\]]+\]/,'') # strip rdoc
   end

data/test/repository/test_api_behavior.rb

@@ -8,8 +8,11 @@ module Stickler
     def setup
       super
       @foo_gem_local_path = File.join( gems_dir, "foo-1.0.0.gem" )
+      @baz_gem_local_path = File.join( gems_dir, "baz-3.1.4-java.gem" )
       @foo_spec           = Stickler::SpecLite.new( 'foo', '1.0.0' )
+      @baz_java_spec      = Stickler::SpecLite.new( 'baz', '3.1.4', 'java')
       assert File.readable?( @foo_gem_local_path ), "#{@foo_gem_local_path} is missing"
+      assert File.readable?( @baz_gem_local_path ), "#{@baz_gem_local_path} is missing"
       @foo_digest         = Digest::SHA1.hexdigest( IO.read( @foo_gem_local_path ) )
       @missing_spec       = Stickler::SpecLite.new( "does_not_exist", "0.1.0" )
     end
@@ -83,6 +86,13 @@ module Stickler
       assert_includes [ ::URI, ::Addressable::URI ], @response_uri.class
     end
 
+    def test_yank_works_with_nondefault_platform
+      assert_empty repo.search_for( @baz_java_spec )
+      repo.push( @baz_gem_local_path )
+      @response_uri = repo.yank( @baz_java_spec )
+      assert_includes [ ::URI, ::Addressable::URI ], @response_uri.class
+    end
+
     def test_yank_returns_nil_for_non_existent_gem
       assert_nil repo.yank( @missing_spec )
     end
@@ -120,6 +130,14 @@ module Stickler
       assert_nil repo.unyank( non_existing_gem )
     end
 
+    def test_unyank_works_with_nondefault_platform
+      assert_empty repo.search_for( @baz_java_spec )
+      repo.push( @baz_gem_local_path )
+      repo.yank( @baz_java_spec )
+      assert_empty repo.search_for( @baz_java_spec )
+      repo.unyank( @baz_java_spec )
+      assert_equal 1, repo.search_for( @baz_java_spec ).size
+    end
 
     # Do we even care about this?
     def test_unyank_returns_nil_for_not_yet_yanked_gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stickler
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.99'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.99'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: 'Stickler is a tool to organize and maintain an internal gem repository.
   Primarily, you would want to use Stickler if: 1. You have proprietary gems that
   you want to have available via a gem server so     you may `gem install` them. 2.
@@ -297,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
@@ -305,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.2'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: 'Stickler is a tool to organize and maintain an internal gem repository.