bower - npm Package Compare versions

Comparing version 1.3.3 to 1.3.4

CHANGELOG.md

 # Changelog
 
+## 1.3.4 - 2014-06-02
+
+- Resolve a situation in which the install process gets into an infinite loop ([#1169](https://github.com/bower/bower/issues/1169))
+- Improved CLI output for conflicts ([#1284](https://github.com/bower/bower/issues/1284))
+- Changed `bower version` to mirror the tag format of `npm version` ([#1278](https://github.com/bower/bower/issues/1278))
+- Allow short commit SHAs to be used ([#990](https://github.com/bower/bower/issues/990))
+
 ## 1.3.3 - 2014-04-24
@@ -4,0 +11,0 @@

CONTRIBUTING.md

@@ -36,4 +36,2 @@ # Contributing to Bower
 
-* 
-
 The issue tracker is the preferred channel for [bug reports](#bugs),
@@ -40,0 +38,0 @@ [features requests](#features) and [submitting pull

lib/commands/version.js

@@ -112,3 +112,4 @@ var mout = require('mout');
 function gitCommitAndTag(newVersion, message) {
-    message = message || 'v' + newVersion;
+    var tag = 'v' + newVersion;
+    message = message || tag;
     message = message.replace(/%s/g, newVersion);
@@ -120,3 +121,3 @@ return Q.nfcall(execFile, 'git', ['add', 'bower.json'], {env: process.env})
     .then(function () {
-        return Q.nfcall(execFile, 'git', ['tag', newVersion, '-am', message], {env: process.env});
+        return Q.nfcall(execFile, 'git', ['tag', tag, '-am', message], {env: process.env});
     });
@@ -142,2 +143,2 @@ }
 
-module.exports = version;
+module.exports = version;

lib/core/Project.js

@@ -58,3 +58,3 @@ var glob = require('glob');
             }
-        });
+        }, true);
 
@@ -61,0 +61,0 @@ // Add decomposed endpoints as targets

lib/core/resolvers/GitResolver.js

@@ -168,2 +168,14 @@ var util = require('util');
 
+        if ((/^[a-f0-9]{4,40}$/).test(target)) {
+            if (target.length < 12) {
+                that._logger.warn(
+                    'short-sha',
+                    'Consider using longer commit SHA to avoid conflicts'
+                );
+            }
+
+            that._resolution = { type: 'commit', commit: target };
+            return that._resolution;
+        }
+
         branches = Object.keys(branches);
@@ -170,0 +182,0 @@ tags = Object.keys(tags);

package.json

 {
   "name": "bower",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "The browser package manager",
@@ -5,0 +5,0 @@ "author": "Twitter",

README.md

@@ -181,3 +181,3 @@ # Bower [![Build Status](https://travis-ci.org/bower/bower.svg?branch=master)](https://travis-ci.org/bower/bower)
 
-You may try to set manually set `CI` variable manually before running your Bower commands. On Mac or Linux, `export CI=true` and on Windows `set CI=true`
+You may try to set the `CI` variable manually before running your Bower commands. On Mac or Linux, `export CI=true` and on Windows `set CI=true`
 
@@ -347,3 +347,16 @@ ### Interactive configuration
 
+## Analytics
 
+Bower collects anonymous usage statistics in order to be able to improve bower, and to publically display package and command usage rankings. Data is tracked using Google Analytics and is made available to all bower team members.
+
+If you'd prefer to disable analytics in Bower altogether, then create either a local, or global `.bowerrc` file with `analytics = false`.
+
+```json
+{
+  "analytics": false
+}
+```
+
+
+
 ## Support
@@ -350,0 +363,0 @@

test/core/resolvers/gitResolver.js

@@ -753,2 +753,23 @@ var expect = require('expect.js');
 
+        it('should resolve to the specified short commit', function (next) {
+            var resolver;
+
+            GitResolver.refs = function () {
+                return Q.resolve([
+                    'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa refs/heads/master'
+                ]);
+            };
+
+            resolver = create('foo');
+            resolver._findResolution('bbbbbbb')
+            .then(function (resolution) {
+                expect(resolution).to.eql({
+                    type: 'commit',
+                    commit: 'bbbbbbb'
+                });
+                next();
+            })
+            .done();
+        });
+
         it('should resolve to the specified tag if it exists', function (next) {
@@ -755,0 +776,0 @@ var resolver;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

620951

increased by0.31%

Lines of code

14121

increased by0.21%

Number of lines in readme file

432

increased by3.1%

Number of medium supply chain risk alerts

2

decreased by-33.33%

No dependency changes