pushwagner 0.0.1 → 0.0.1.1

data/.gitignore

@@ -1 +1,2 @@
 .idea
+*.gem

data/README.md

@@ -0,0 +1 @@
+[X] Release early, [ ] Release often

data/TODO.md

@@ -0,0 +1,33 @@
+Static-file provision:
+
+[ ] Support hooks, i.e.:
+  hooks:
+    before:
+      - cmd: mvn package
+        cwd: anyone-web
+        scope: local
+    after:
+      - cmd: unzip anyone-web.zip
+        cwd: /srv/www/gethubble.com
+        scope: remote
+[ ] Add another wrapper for files:
+static:
+  name:
+    files:            # files to upload
+      - ...
+    hooks:            # before and after deploy hooks
+      - ...
+    services:         # assumes service with same name
+      - restart
+
+
+Maven:
+[ ] Support hooks (?)
+
+Conventions:
+- Maven artifacts are deployed to `$path_prefix/$artifact_id`
+- Services assume name: `$artifact_id`
+
+Static-files:
+- Are uploaded to `$path_prefix/$name`
+- Services assume name: `$name`

data/lib/pushwagner/environment.rb

@@ -11,7 +11,7 @@ module Pushwagner
       opts = HashWithIndifferentAccess.new(opts)
 
       config_file = opts[:config_file] || File.join(File.dirname(__FILE__), '/config/deploy.yml')
-      @version = opts[:version]
+      @version = opts[:version].to_s
       @current = opts[:environment] || 'development'
 
       @config = HashWithIndifferentAccess.new(YAML::load_file(config_file) || {})
@@ -22,7 +22,7 @@ module Pushwagner
     end
 
     def maven
-      @maven = config['maven'] ? Maven.new(config['maven'], version) : {}
+      @maven = (config['maven'] ? Maven.new(config['maven'], version) : {})
     end
 
     def maven?

data/lib/pushwagner/main.rb

@@ -10,12 +10,12 @@ module Pushwagner
     end
 
     def set_version(version)
-      @environment.version = version
+      @environment.version = version.to_s
     end
 
     def deploy(opts = {})
-      Maven::Deployer.new(@environment, opts).deploy
-      Static::Deployer.new(@environment, opts).deploy
+      Maven::Deployer.new(@environment, opts).deploy if @environment.maven?
+      Static::Deployer.new(@environment, opts).deploy if @environment.static?
     end
 
     def restart(opts = {})

data/lib/pushwagner/maven.rb

@@ -9,16 +9,22 @@ module Pushwagner
 
     attr_reader :repository, :artifacts
     def initialize(maven, version)
-      return if !maven or maven.empty?
+      required("Need maven configuration") unless maven
 
-      @version = version || required("Deployment version for artifacts is required")
+      @version = version.to_s || required("Deployment version for artifacts is required")
       @repository = Repository.new(maven['repositories'])
-      @artifacts = Hash[(maven['artifacts'] || {}).map { |k,h| [k, Artifact.new(h['artifact_id'], h['group_id'], h['version'] || version)] }]
+      @artifacts = Hash[(maven['artifacts'] || required("Requires at least one maven artifact")).map { |k,h| [k, Artifact.new(h['artifact_id'], h['group_id'], h['version'] || version)] }]
+
+      (artifacts && repository) || required("Could not initialize maven configuration")
     end
 
     def required(msg)
       raise StandardError.new(msg)
     end
+
+    def any?
+      artifacts && repository
+    end
   end
 
   class Maven::Artifact
@@ -63,7 +69,7 @@ module Pushwagner
 
     def absolute_url(artifact)
       if artifact.snapshot?
-        doc = Nokogiri::XML(open(URI.parse("#{snapshots_url}/#{artifact.base_path}/maven-metadata.xml"), :http_basic_authentication => authentication(false)))
+        doc = Nokogiri::XML(open(URI.parse("#{snapshots_url}/#{artifact.base_path}/maven-metadata.xml"), :http_basic_authentication => authentication(true).split(":")))
         snapshot_version = doc.xpath("//metadata/versioning/snapshotVersions/snapshotVersion/value/text()").first.content
         return "#{snapshots_url}/#{artifact.base_path}/#{artifact.artifact_id}-#{snapshot_version}.jar"
       end
@@ -118,22 +124,21 @@ module Pushwagner
     def pull_artifact(name, artifact, host)
       Net::SSH.start(host, environment.user) do |ssh|
         puts "Pulling #{repository.absolute_url(artifact)} to #{host}:#{environment.path_prefix}/#{artifact.jar_name}..."
-        ssh.exec("curl --user '#{repository.authentication(artifact.snapshot?)}' #{repository.absolute_url(artifact)} > #{environment.path_prefix}/#{artifact.jar_name}")
+        ssh.exec("curl --user '#{repository.authentication(artifact.snapshot?)}' #{repository.absolute_url(artifact)} > #{environment.path_prefix}/#{name}/#{artifact.jar_name}")
       end
     end
 
     def mark_previous(name, host)
-      Net::SSH.start(host, user) do |ssh|
+      Net::SSH.start(host, environment.user) do |ssh|
         puts "Marking previous release on #{host}..."
-        ssh.exec("cp -P #{environment.path_prefix}/#{name}.jar #{environment.path_prefix}/#{name}.previous.jar")
+        ssh.exec("cp -P #{environment.path_prefix}/#{name}/#{name}.jar #{environment.path_prefix}/#{name}/#{name}.previous.jar")
       end
     end
 
     def mark_new(name, artifact, host)
-      Net::SSH.start(host, user) do |ssh|
-        cwd = deploy_path(app_name)
+      Net::SSH.start(host, environment.user) do |ssh|
         puts "Marking #{artifact.jar_name} as current on #{host}..."
-        ssh.exec("ln -sf #{environment.path_prefix}/#{artifact.jar_name} #{environment.path_prefix}/#{name}.jar")
+        ssh.exec("ln -sf #{environment.path_prefix}/#{name}/#{artifact.jar_name} #{environment.path_prefix}/#{name}/#{name}.jar")
       end
     end
 

data/lib/pushwagner/version.rb

@@ -1,3 +1,3 @@
 module Pushwagner
-  VERSION = "0.0.1"
-end
+  VERSION = "0.0.1.1"
+end

data/spec/maven_spec.rb

@@ -9,6 +9,14 @@ describe Pushwagner::Maven do
       expect { Pushwagner::Maven.new(cfg, nil) }.to raise_error(StandardError, "Deployment version for artifacts is required")
     end
 
+    it "requires valid configuration" do
+      expect{Pushwagner::Maven.new(nil, "1baz")}.to raise_error(StandardError, "Need maven configuration")
+    end
+
+    it "requires valid repositories configuration" do
+      expect{Pushwagner::Maven.new({}, "1baz")}.to raise_error(StandardError, "repositories configuration required")
+    end
+
     it "trickles the version down to artifacts" do
       m = Pushwagner::Maven.new(cfg, "1foo")
       expect(m.artifacts["some-api"].version).to eq("1foo")
@@ -19,17 +27,10 @@ describe Pushwagner::Maven do
       expect(m.artifacts["some-notifier"].version).to eq("1.0final")
     end
 
-    it "returns nil-object maven when not configured" do
-      m = Pushwagner::Maven.new({}, "1baz")
-      expect(m.artifacts).to be_nil
-      expect(m).to_not be_nil
-    end
-
     describe "initialization of artifacts" do
-      it "handles no artifacts" do
+      it "requires at least one artifact" do
         cfg.delete('artifacts')
-        m = Pushwagner::Maven.new(cfg, "1bar")
-        expect(m.artifacts.size).to eq(0)
+        expect {Pushwagner::Maven.new(cfg, "1bar")}.to raise_error(StandardError, "Requires at least one maven artifact")
       end
       it "parses two artifacts" do
         m = Pushwagner::Maven.new(cfg, "1bar")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushwagner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -118,7 +118,9 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- README.md
 - Rakefile
+- TODO.md
 - bin/pw
 - lib/pushwagner.rb
 - lib/pushwagner/environment.rb