@@ -16,9 +16,9 @@ var currentPackage, previousVersions, cdnVersion, gitRepoInfo;
16
16
var getPackage = function ( ) {
17
17
// Search up the folder hierarchy for the first package.json
18
18
var packageFolder = path . resolve ( '.' ) ;
19
- while ( ! fs . existsSync ( path . join ( packageFolder , 'package.json' ) ) ) {
19
+ while ( ! fs . existsSync ( path . join ( packageFolder , 'package.json' ) ) ) {
20
20
var parent = path . dirname ( packageFolder ) ;
21
- if ( parent === packageFolder ) { break ; }
21
+ if ( parent === packageFolder ) { break ; }
22
22
packageFolder = parent ;
23
23
}
24
24
return JSON . parse ( fs . readFileSync ( path . join ( packageFolder , 'package.json' ) , 'UTF-8' ) ) ;
@@ -48,11 +48,11 @@ var getGitRepoInfo = function() {
48
48
* @return {String } The codename if found, otherwise null/undefined
49
49
*/
50
50
var getCodeName = function ( tagName ) {
51
- var gitCatOutput = shell . exec ( 'git cat-file -p ' + tagName , { silent :true } ) . output ;
51
+ var gitCatOutput = shell . exec ( 'git cat-file -p ' + tagName , { silent :true } ) . output ;
52
52
var tagMessage = gitCatOutput . match ( / ^ .* c o d e n a m e .* $ / mg) [ 0 ] ;
53
53
var codeName = tagMessage && tagMessage . match ( / c o d e n a m e \( ( .* ) \) / ) [ 1 ] ;
54
54
if ( ! codeName ) {
55
- throw new Error ( "Could not extract release code name. The message of tag " + tagName +
55
+ throw new Error ( "Could not extract release code name. The message of tag " + tagName +
56
56
" must match '*codename(some release name)*'" ) ;
57
57
}
58
58
return codeName ;
@@ -65,7 +65,7 @@ var getCodeName = function(tagName) {
65
65
*/
66
66
function getBuild ( ) {
67
67
var hash = shell . exec ( 'git rev-parse --short HEAD' , { silent : true } ) . output . replace ( '\n' , '' ) ;
68
- return 'sha.' + hash ;
68
+ return 'sha.' + hash ;
69
69
}
70
70
71
71
@@ -76,11 +76,11 @@ function getBuild() {
76
76
var getTaggedVersion = function ( ) {
77
77
var gitTagResult = shell . exec ( 'git describe --exact-match' , { silent :true } ) ;
78
78
79
- if ( gitTagResult . code === 0 ) {
79
+ if ( gitTagResult . code === 0 ) {
80
80
var tag = gitTagResult . output . trim ( ) ;
81
81
var version = semver . parse ( tag ) ;
82
82
83
- if ( version && semver . satisfies ( version , currentPackage . branchVersion ) ) {
83
+ if ( version && semver . satisfies ( version , currentPackage . branchVersion ) ) {
84
84
version . codeName = getCodeName ( tag ) ;
85
85
version . full = version . version ;
86
86
version . branch = 'v' + currentPackage . branchPattern . replace ( '*' , 'x' ) ;
@@ -102,7 +102,7 @@ var getPreviousVersions = function() {
102
102
var repo_url = currentPackage . repository . url ;
103
103
var tagResults = shell . exec ( 'git ls-remote --tags ' + repo_url ,
104
104
{ silent : true } ) ;
105
- if ( tagResults . code === 0 ) {
105
+ if ( tagResults . code === 0 ) {
106
106
return _ ( tagResults . output . match ( / v [ 0 - 9 ] .* [ 0 - 9 ] $ / mg) )
107
107
. map ( function ( tag ) {
108
108
var version = semver . parse ( tag ) ;
@@ -112,7 +112,7 @@ var getPreviousVersions = function() {
112
112
. map ( function ( version ) {
113
113
version . docsUrl = 'http://code.angularjs.org/' + version . version + '/docs' ;
114
114
// Versions before 1.0.2 had a different docs folder name
115
- if ( version . major < 1 || ( version . major === 1 && version . minor === 0 && version . dot < 2 ) ) {
115
+ if ( version . major < 1 || ( version . major === 1 && version . minor === 0 && version . dot < 2 ) ) {
116
116
version . docsUrl += '-' + version . version ;
117
117
}
118
118
return version ;
@@ -130,18 +130,14 @@ var getCdnVersion = function() {
130
130
return semver . satisfies ( tag , currentPackage . branchVersion ) ;
131
131
} )
132
132
. reverse ( )
133
- . tap ( function ( versions ) {
134
- console . log ( versions ) ;
135
- } )
136
133
. reduce ( function ( cdnVersion , version ) {
137
134
if ( ! cdnVersion ) {
138
135
// Note: need to use shell.exec and curl here
139
136
// as version-infos returns its result synchronously...
140
- var cdnResult = shell . exec ( 'curl http://ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular.min.js ' +
137
+ var cdnResult = shell . exec ( 'curl http://ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular.min.js ' +
141
138
'--head --write-out "%{http_code}" -o /dev/null -silent' ,
142
139
{ silent : false } ) ;
143
- console . log ( 'http://ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular.min.js' ) ;
144
- if ( cdnResult . code === 0 ) {
140
+ if ( cdnResult . code === 0 ) {
145
141
var statusCode = cdnResult . output . trim ( ) ;
146
142
if ( statusCode === '200' ) {
147
143
cdnVersion = version ;
@@ -163,7 +159,7 @@ var getSnapshotVersion = function() {
163
159
} )
164
160
. last ( ) ;
165
161
166
- if ( ! version ) {
162
+ if ( ! version ) {
167
163
// a snapshot version before the first tag on the branch
168
164
version = semver ( currentPackage . branchPattern . replace ( '*' , '0-beta.1' ) ) ;
169
165
}
0 commit comments