Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Jul 28, 2015
  1. @indirect

    Merge pull request #3886 from esasse/rubocop-fix

    indirect authored
    Fix Style/AlignArray
  2. @indirect

    Merge pull request #3885 from bundler/aa-3811-specific-test-deps

    indirect authored
    Depend on major version of test gems
Commits on Jul 27, 2015
  1. @esasse

    Better formatting

    esasse authored
  2. @esasse

    Fix Style/AlignArray

    esasse authored
  3. @indirect

    block spaces for rubocop

    indirect authored
  4. @homu

    Auto merge of #3884 - bundler:rubocop-first, r=indirect

    homu authored
    Run Rubocop before specs
    
    This fails faster on style issues.
  5. @indirect

    double quotes for RuboCop

    indirect authored
  6. @indirect

    test for rspec and minitest specific deps

    indirect authored
    RubyGems didn’t add #specific? until 1.8.1
  7. @tf @indirect

    Pessimistic test framework versions for bundle gem command

    tf authored indirect committed
    Use a pessimistic version requirement for RSpec and Minitest in
    gemspecs generated by the `bundle gem` command. It is best practice to
    at least depend on major versions of development dependency gems.
    
    * Hard code major versions of the two testing frameworks.
    * Add a spec that tests that only specific version requirements are
      used in development dependencies.
  8. @indirect
  9. @TimMoore @indirect

    Run Rubocop before specs.

    TimMoore authored indirect committed
    This fails faster on style issues.
  10. @indirect

    Merge pull request #3881 from roseweixel/sanitize-config-test

    indirect authored
    fix bug that causes "run `rake false`" to appear in README.md
  11. @homu

    Auto merge of #3878 - cdwort:make_specs_work_with_local_git_config, r…

    homu authored
    …=indirect
    
    Make test suite work with local git configs
    
    On my work laptop, I was seeing failures in `spec/commands/newgem_spec.rb` due to the presence of  local `.git/config` files.
    
    On my work computer, my global config is my work (private gitlab) credentials. Each github repo has a local config with my “cdwort” credentials. For example, I have one placed in `/Path/To/Bundler/.git/config`. 
    
    Unfortunately, when a new gem is created within the test file noted above, it is created within the /Path/To/Bundler/ directory. This means it picks up my local config. All the tests for when there is no git config information fail because instead of getting nothing (which those tests expect because the test overrides my global amy.unger@corporatecompany.com setting), it gets my GitHub email.
    
    I am using the `--remove-section` flag because if you only `--unset user.email` and `--unset user.name`, you get the following junk in your .git/config file. Yes, at the very bottom is the appropriate config.
    
    <img width="481" alt="screen shot 2015-07-24 at 11 51 41 pm" src="https://cloud.githubusercontent.com/assets/1014482/8887995/6fe3be74-3260-11e5-999b-286d82c41844.png">
    
    This has one drawback - it rearranges your file. I prefer my `[user]` section at the top of the file (good for troubleshooting when I've done stupid things). This places it at the bottom of the file, because the section is removed and then recreated each time for each test.
    
    I'll take that trade-off for running my tests on my work laptop, but I can see that this is unexpected behavior and might prohibit this PR from going forward. Thoughts?
  12. @roseweixel

    remove trailing whitespace

    roseweixel authored
  13. @cdwort

    Fix style to use double quotes

    cdwort authored
  14. @cdwort

    Use a Bundler specific gitconfig file rather than altering user's files

    cdwort authored
    - Make test suite work with local git configs
    - Prefer altering environment variable to altering user's ~/.gitconfig file
Commits on Jul 26, 2015
  1. @roseweixel
  2. @roseweixel
  3. @roseweixel
Commits on Jul 24, 2015
  1. @homu

    Auto merge of #3876 - esasse:rubocop-fix, r=indirect

    homu authored
    Fix Style/Alias
  2. @esasse

    Fix Style/Alias

    esasse authored
Commits on Jul 23, 2015
  1. @homu

    Auto merge of #3875 - esasse:rubocop-fix, r=segiddins

    homu authored
    Fix Performance/ReverseEach
  2. @esasse

    Fix Performance/ReverseEach

    esasse authored
  3. @homu

    Auto merge of #3874 - bundler:seg-settings-permission-error, r=indirect

    homu authored
    Raise permission error when config file isn't readable
    
    Closes #3858
  4. @segiddins
  5. @segiddins
  6. @segiddins
Commits on Jul 22, 2015
  1. @homu

    Auto merge of #3870 - cdwort:fix_strange_failure, r=segiddins

    homu authored
    Make sure that monkeypatch of Gem::Platform gets loaded on subshells
    
    When running `spec/cache/gems_spec.rb:213` on master, I got the following error due to the monkey patch of `Gem::Platform::local` in `spec/support/hax.rb` not getting loaded when the spec runs `bundle :install`.
    
    ```
    ➜ ~/dev/bundler (master)↑ $ /Users/aunger/.rvm/rubies/ruby-2.2.0/bin/ruby -S rspec ./spec/cache/gems_spec.rb:213
    
    Run options:
      include {:focused=>true, :locations=>{"./spec/cache/gems_spec.rb"=>[213]}}
      exclude {:rubygems_master=>true, :rubygems=>"=< 2.4.5", :ruby=>"=< 2.2.0", :realworld=>true, :sudo=>true}
    
    bundle cache
      when previously cached
    
    Updating files in vendor/cache
        doesn't remove gems that are for another platform (FAILED - 1)
    
    Failures:
    
      1) bundle cache when previously cached doesn't remove gems that are for another platform
         Failure/Error: expect(cached_gem("platform_specific-1.0-java")).to exist
           expected #<Pathname:/Users/aunger/dev/bundler/tmp/bundled_app/vendor/cache/platform_specific-1.0-java.gem> to exist
         # ./spec/cache/gems_spec.rb:221:in `block (4 levels) in <top (required)>'
         # ./spec/support/helpers.rb:305:in `simulate_platform'
         # ./spec/cache/gems_spec.rb:214:in `block (3 levels) in <top (required)>'
    
    Finished in 1.95 seconds (files took 0.20268 seconds to load)
    1 example, 1 failure
    
    Failed examples:
    
    rspec ./spec/cache/gems_spec.rb:213 # bundle cache when previously cached doesn't remove gems that are for another platform
    ```
  2. @segiddins

    Merge tag 'v1.10.6'

    segiddins authored
    Version 1.10.6
    
    # Conflicts:
    #	lib/bundler/cli.rb
    #	lib/bundler/source/git/git_proxy.rb
    #	spec/install/parallel/spec_installation_spec.rb
  3. @segiddins

    Update changelog for 1.10.6

    segiddins authored
  4. @cdwort
  5. @homu

    Auto merge of #3869 - esasse:rubocop-fix, r=indirect

    homu authored
    Fix Style/AccessModifierIndentation
    
    The @indirect Style :smile:
  6. @indirect

    Merge pull request #3867 from mattbrictson/bin-exe-path

    indirect authored
    bin should be exe in `alias dbundle` instructions
  7. @indirect

    Allow building auto for @homu

    indirect authored
    [ci skip]
  8. @esasse
Something went wrong with that request. Please try again.