From d0628bbe7be8c25af7f06b65b357122dee071620 Mon Sep 17 00:00:00 2001
From: Ke Zhu <davidzhu.4.2@gmail.com>
Date: Sun, 4 May 2014 13:29:51 -0400
Subject: [PATCH 1/3] support publishing to npm

---
 Makefile                       |  1 +
 pkg/plugin/publish/npm.go      | 72 ++++++++++++++++++++++++++
 pkg/plugin/publish/npm_test.go | 95 ++++++++++++++++++++++++++++++++++
 pkg/plugin/publish/publish.go  |  6 +++
 4 files changed, 174 insertions(+)
 create mode 100644 pkg/plugin/publish/npm_test.go

diff --git a/Makefile b/Makefile
index a1e3476c..93ed269b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ database/testing \
 mail \
 model \
 plugin/deploy \
+plugin/publish \
 queue
 PKGS := $(addprefix github.com/drone/drone/pkg/,$(PKGS))
 .PHONY := test $(PKGS)
diff --git a/pkg/plugin/publish/npm.go b/pkg/plugin/publish/npm.go
index 30b1a5b2..865e70d8 100644
--- a/pkg/plugin/publish/npm.go
+++ b/pkg/plugin/publish/npm.go
@@ -1 +1,73 @@
 package publish
+
+import (
+    "fmt"
+
+    "github.com/drone/drone/pkg/build/buildfile"
+)
+
+var npmLoginCmd = `
+npm login <<EOF
+%s
+%s
+%s
+EOF
+`
+
+type NPM struct {
+    // The Email address used by NPM to connect
+    // and publish to a repository
+    Email string `yaml:"email,omitempty"`
+
+    // The Username used by NPM to connect
+    // and publish to a repository
+    Username string `yaml:"username,omitempty"`
+
+    // The Password used by NPM to connect
+    // and publish to a repository
+    Password string `yaml:"password,omitempty"`
+
+    // Fails if the package name and version combination already
+    // exists in the registry. Overwrites when the "--force" flag is set.
+    Force bool `yaml:"force"`
+
+    // The registry URL of custom npm repository
+    Registry string `yaml:"registry,omitempty"`
+
+    // A folder containing the package.json file
+    Folder string `yaml:"folder,omitempty"`
+
+    // Registers the published package with the given tag
+    Tag string `yaml:"tag,omitempty"`
+
+    Branch string `yaml:"branch,omitempty"`
+}
+
+func (n *NPM) Write(f *buildfile.Buildfile) {
+
+    if len(n.Email) == 0 || len(n.Username) == 0 || len(n.Password) == 0 {
+        return
+    }
+
+    npmPublishCmd := "npm publish %s"
+
+    // Setup custom npm registry
+    if n.Registry != "" {
+        f.WriteCmdSilent(fmt.Sprintf("npm config set registry %s", n.Registry))
+    }
+
+    if n.Tag != "" {
+        npmPublishCmd += fmt.Sprintf(" --tag %s", n.Tag)
+    }
+
+    if n.Force {
+        npmPublishCmd += " --force"
+    }
+
+    f.WriteCmdSilent("echo 'publishing to NPM ...'")
+
+    // Login to registry
+    f.WriteCmdSilent(fmt.Sprintf(npmLoginCmd, n.Username, n.Password, n.Email))
+
+    f.WriteCmd(fmt.Sprintf(npmPublishCmd, n.Folder))
+}
\ No newline at end of file
diff --git a/pkg/plugin/publish/npm_test.go b/pkg/plugin/publish/npm_test.go
new file mode 100644
index 00000000..d94d7bac
--- /dev/null
+++ b/pkg/plugin/publish/npm_test.go
@@ -0,0 +1,95 @@
+package publish
+
+import (
+    "strings"
+    "testing"
+
+    "github.com/drone/drone/pkg/build/buildfile"
+
+    "launchpad.net/goyaml"
+)
+
+// emulate Build struct
+type PublishToNPM struct {
+    Publish *Publish `yaml:"publish,omitempty"`
+}
+
+var sampleYml1 = `
+publish:
+  npm:
+    username: foo
+    email: foo@example.com
+    password: bar
+`
+
+var sampleYml2 = `
+publish:
+  npm:
+    username: foo
+    email: foo@example.com
+    password: bar
+    force: true
+`
+
+var sampleYmlWithReg = `
+publish:
+  npm:
+    username: foo
+    email: foo@example.com
+    password: bar
+    registry: https://npm.example.com/me/
+    folder: my-project/node-app/
+    tag: 1.2.3
+`
+
+func setUpWithNPM(input string) (string, error) {
+    var buildStruct PublishToNPM
+    err := goyaml.Unmarshal([]byte(input), &buildStruct)
+    if err != nil {
+        return "", err
+    }
+    bf := buildfile.New()
+    buildStruct.Publish.Write(bf, nil)
+    return bf.String(), err
+}
+
+func TestNPMPublish(t *testing.T) {
+    bscr, err := setUpWithNPM(sampleYml1)
+    if err != nil {
+        t.Fatalf("Can't unmarshal publish script: %s", err)
+    }
+
+    if !strings.Contains(bscr, "npm login") {
+        t.Error("Expect script to contain login command")
+    }
+
+    if !strings.Contains(bscr, "npm publish") {
+        t.Error("Expect script to contain install command")
+    }
+}
+
+func TestNPMForcePublish(t *testing.T) {
+    bscr, err := setUpWithNPM(sampleYml2)
+    if err != nil {
+        t.Fatalf("Can't unmarshal publish script: %s", err)
+    }
+
+    if !strings.Contains(bscr, "npm publish  --force") {
+        t.Error("Expect script to contain install command")
+    }
+}
+
+func TestNPMPublishRegistry(t *testing.T) {
+    bscr, err := setUpWithNPM(sampleYmlWithReg)
+    if err != nil {
+        t.Fatalf("Can't unmarshal publish script: %s", err)
+    }
+
+    if !strings.Contains(bscr, "npm config set registry https://npm.example.com/me/") {
+        t.Error("Expect script to contain npm config registry command")
+    }
+
+    if !strings.Contains(bscr, "npm publish my-project/node-app/ --tag 1.2.3") {
+        t.Error("Expect script to contain npm publish command")
+    }
+}
diff --git a/pkg/plugin/publish/publish.go b/pkg/plugin/publish/publish.go
index 93dceb18..546be583 100644
--- a/pkg/plugin/publish/publish.go
+++ b/pkg/plugin/publish/publish.go
@@ -12,6 +12,7 @@ type Publish struct {
 	S3    *S3    `yaml:"s3,omitempty"`
 	Swift *Swift `yaml:"swift,omitempty"`
 	PyPI  *PyPI  `yaml:"pypi,omitempty"`
+	NPM   *NPM   `yaml:"npm,omitempty"`
 }
 
 func (p *Publish) Write(f *buildfile.Buildfile, r *repo.Repo) {
@@ -29,4 +30,9 @@ func (p *Publish) Write(f *buildfile.Buildfile, r *repo.Repo) {
 	if p.PyPI != nil && (len(p.PyPI.Branch) == 0 || (len(p.PyPI.Branch) > 0 && r.Branch == p.PyPI.Branch)) {
 		p.PyPI.Write(f)
 	}
+
+	// NPM
+	if p.NPM != nil && (len(p.NPM.Branch) == 0 || (len(p.NPM.Branch) > 0 && r.Branch == p.NPM.Branch)) {
+		p.NPM.Write(f)
+	}
 }

From d77b3209b024436cc26ce2d04dc579596e7da69a Mon Sep 17 00:00:00 2001
From: Ke Zhu <davidzhu.4.2@gmail.com>
Date: Sun, 4 May 2014 21:48:03 -0400
Subject: [PATCH 2/3] update npm login method

---
 pkg/plugin/publish/npm.go      | 8 ++++----
 pkg/plugin/publish/npm_test.go | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkg/plugin/publish/npm.go b/pkg/plugin/publish/npm.go
index 865e70d8..42b26165 100644
--- a/pkg/plugin/publish/npm.go
+++ b/pkg/plugin/publish/npm.go
@@ -6,11 +6,11 @@ import (
     "github.com/drone/drone/pkg/build/buildfile"
 )
 
+// use npm trick instead of running npm adduser that requires stdin
 var npmLoginCmd = `
-npm login <<EOF
-%s
-%s
-%s
+cat <<EOF > ~/.npmrc
+_auth = $(echo "%s:%s" | tr -d "\r\n" | base64)
+email = %s
 EOF
 `
 
diff --git a/pkg/plugin/publish/npm_test.go b/pkg/plugin/publish/npm_test.go
index d94d7bac..96c52581 100644
--- a/pkg/plugin/publish/npm_test.go
+++ b/pkg/plugin/publish/npm_test.go
@@ -59,10 +59,6 @@ func TestNPMPublish(t *testing.T) {
         t.Fatalf("Can't unmarshal publish script: %s", err)
     }
 
-    if !strings.Contains(bscr, "npm login") {
-        t.Error("Expect script to contain login command")
-    }
-
     if !strings.Contains(bscr, "npm publish") {
         t.Error("Expect script to contain install command")
     }

From 0ee9b163b9747a7d911d795f4653476425e293a1 Mon Sep 17 00:00:00 2001
From: Ke Zhu <davidzhu.4.2@gmail.com>
Date: Sun, 4 May 2014 22:05:24 -0400
Subject: [PATCH 3/3] correct npm publish logic

---
 pkg/plugin/publish/npm.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/plugin/publish/npm.go b/pkg/plugin/publish/npm.go
index 42b26165..d31879ed 100644
--- a/pkg/plugin/publish/npm.go
+++ b/pkg/plugin/publish/npm.go
@@ -51,11 +51,6 @@ func (n *NPM) Write(f *buildfile.Buildfile) {
 
     npmPublishCmd := "npm publish %s"
 
-    // Setup custom npm registry
-    if n.Registry != "" {
-        f.WriteCmdSilent(fmt.Sprintf("npm config set registry %s", n.Registry))
-    }
-
     if n.Tag != "" {
         npmPublishCmd += fmt.Sprintf(" --tag %s", n.Tag)
     }
@@ -69,5 +64,10 @@ func (n *NPM) Write(f *buildfile.Buildfile) {
     // Login to registry
     f.WriteCmdSilent(fmt.Sprintf(npmLoginCmd, n.Username, n.Password, n.Email))
 
+    // Setup custom npm registry
+    if n.Registry != "" {
+        f.WriteCmdSilent(fmt.Sprintf("npm config set registry %s", n.Registry))
+    }
+
     f.WriteCmd(fmt.Sprintf(npmPublishCmd, n.Folder))
 }
\ No newline at end of file