lock_jar 0.14.0 → 0.14.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/lock_jar/bundler.rb +8 -4
- data/lib/lock_jar/runtime/lock.rb +3 -2
- data/lib/lock_jar/version.rb +1 -1
- metadata +1 -1
    
        checksums.yaml
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            ---
         | 
| 2 2 | 
             
            SHA1:
         | 
| 3 | 
            -
              metadata.gz:  | 
| 4 | 
            -
              data.tar.gz:  | 
| 3 | 
            +
              metadata.gz: 5998af4c7ae20beeb17bcc2545cb8965777119cb
         | 
| 4 | 
            +
              data.tar.gz: 8ea6c1dbf3253883fbd9e739ad3a52724a8b88ba
         | 
| 5 5 | 
             
            SHA512:
         | 
| 6 | 
            -
              metadata.gz:  | 
| 7 | 
            -
              data.tar.gz:  | 
| 6 | 
            +
              metadata.gz: 17c9ee504886cbe8d55b9a143a7a2af961d660ecfcbe15913b2b3f87f6b5c9905ddec8ab2be8040b400d220ed27ea3d18422a07d0da27cf8434d0380578e3131
         | 
| 7 | 
            +
              data.tar.gz: dc1ff550cedb9bbe83464f6888dee82c79d359d15bc9b0d15ab5ac74617a463ac8ca7a68f8b7042cfa36404d9a1e60af44edd0be7edbf29be2a3a4b93992fb80
         | 
    
        data/lib/lock_jar/bundler.rb
    CHANGED
    
    | @@ -68,12 +68,16 @@ module LockJar | |
| 68 68 | 
             
                    end
         | 
| 69 69 |  | 
| 70 70 | 
             
                    definition.groups.each do |group|
         | 
| 71 | 
            -
                      puts  | 
| 71 | 
            +
                      puts "[LockJar] Group #{group}:" if ENV['DEBUG']
         | 
| 72 72 |  | 
| 73 73 | 
             
                      definition.specs_for([group]).each do |spec|
         | 
| 74 | 
            -
                         | 
| 75 | 
            -
             | 
| 76 | 
            -
             | 
| 74 | 
            +
                        if File.exist? File.join(spec.gem_dir, 'Jarfile')
         | 
| 75 | 
            +
                          merged_dsl = merge_gem_dsl(dsl, spec, group)
         | 
| 76 | 
            +
                          if merged_dsl
         | 
| 77 | 
            +
                            gems_with_jars << "gem:#{spec.name}"
         | 
| 78 | 
            +
                            dsl = merged_dsl
         | 
| 79 | 
            +
                          end
         | 
| 80 | 
            +
                        end
         | 
| 77 81 | 
             
                      end
         | 
| 78 82 | 
             
                    end
         | 
| 79 83 |  | 
| @@ -14,6 +14,7 @@ module LockJar | |
| 14 14 | 
             
                  end
         | 
| 15 15 |  | 
| 16 16 | 
             
                  def lock(jarfile_or_dsl, opts = {}, &blk)
         | 
| 17 | 
            +
             | 
| 17 18 | 
             
                    @opts = { download: true }.merge(opts)
         | 
| 18 19 |  | 
| 19 20 | 
             
                    create_dsl!(jarfile_or_dsl, &blk)
         | 
| @@ -104,6 +105,8 @@ module LockJar | |
| 104 105 | 
             
                  end
         | 
| 105 106 |  | 
| 106 107 | 
             
                  def apply_repositories!
         | 
| 108 | 
            +
                    lockfile.local_repository = opts[:local_repo] || jarfile.local_repository
         | 
| 109 | 
            +
             | 
| 107 110 | 
             
                    if jarfile.clear_repositories
         | 
| 108 111 | 
             
                      resolver(opts).clear_remote_repositories
         | 
| 109 112 | 
             
                    else
         | 
| @@ -116,8 +119,6 @@ module LockJar | |
| 116 119 | 
             
                      resolver(opts).add_remote_repository(repo)
         | 
| 117 120 | 
             
                      lockfile.remote_repositories << repo
         | 
| 118 121 | 
             
                    end
         | 
| 119 | 
            -
             | 
| 120 | 
            -
                    lockfile.local_repository = opts[:local_repo] || jarfile.local_repository
         | 
| 121 122 | 
             
                  end
         | 
| 122 123 |  | 
| 123 124 | 
             
                  def add_artifact!(group, artifact_data, artifact)
         | 
    
        data/lib/lock_jar/version.rb
    CHANGED