pushwagner 0.0.1.1 → 0.0.1.2

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - 1.8.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushwagner (0.0.1)
+    pushwagner (0.0.1.1)
       net-scp
       net-ssh
       nokogiri (~> 1.5)

data/README.md

@@ -1 +1,4 @@
+# Pushwagner [![Build Status](https://secure.travis-ci.org/oc/pushwagner.png)](http://travis-ci.org/oc/pushwagner)
+
+
 [X] Release early, [ ] Release often

data/TODO.md

@@ -1,24 +1,27 @@
 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
+
+    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
+
+    static:
+      name:
+        files:            # files to upload
+          - ...
+        hooks:            # before and after deploy hooks
+          - ...
+        services:         # assumes service with same name
+          - restart
 
 
 Maven:

data/lib/pushwagner/environment.rb

@@ -1,5 +1,6 @@
 require 'pushwagner/ext'
 require 'pushwagner/maven'
+require 'yaml'
 
 module Pushwagner
 
@@ -11,7 +12,7 @@ module Pushwagner
       opts = HashWithIndifferentAccess.new(opts)
 
       config_file = opts[:config_file] || File.join(File.dirname(__FILE__), '/config/deploy.yml')
-      @version = opts[:version].to_s
+      @version = opts[:version] && opts[:version].to_s
       @current = opts[:environment] || 'development'
 
       @config = HashWithIndifferentAccess.new(YAML::load_file(config_file) || {})

data/lib/pushwagner/maven.rb

@@ -11,7 +11,12 @@ module Pushwagner
     def initialize(maven, version)
       required("Need maven configuration") unless maven
 
-      @version = version.to_s || required("Deployment version for artifacts is required")
+      if version && !version.empty?
+        @version = version
+      else
+        required("Deployment version for artifacts is required")
+      end
+
       @repository = Repository.new(maven['repositories'])
       @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)] }]
 

data/lib/pushwagner/version.rb

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

data/spec/configs/full.yml

@@ -13,7 +13,7 @@ maven:
       artifact_id: trouble-notifier
 
 static:
-  diakonhjemmet.uppercase.no:
+  blah.uppercase.no:
     - index.htm
     - static
 

data/spec/configs/static.yml

@@ -1,7 +1,7 @@
 path_prefix: /static/path
 
 static:
-  diakonhjemmet.uppercase.no:
+  blah.uppercase.no:
     - index.htm
     - static
 

data/spec/environment_spec.rb

@@ -22,7 +22,7 @@ describe Pushwagner::Environment do
       expect(env.version).to eq("1.3.3.7")
     end
   end
-  describe "#maven" do
+  describe "maven artifacts" do
     it "requires a version" do
       env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'maven.yml'))
       expect { env.maven }.to raise_error(StandardError, "Deployment version for artifacts is required")
@@ -34,41 +34,41 @@ describe Pushwagner::Environment do
       expect(env.maven).to eq({})
     end
   end
-  describe "#static" do
+  describe "static files" do
     it "returns empty hash when not configured" do
       env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'maven.yml'), :version => "1foo" )
       expect(env.static?).to be_false
       expect(env.static).to eq({})
     end
-    it "is a hash with files" do
+    it "parses to a hash of files" do
       env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'static.yml'))
-      expect(env.static).to eq({'diakonhjemmet.uppercase.no' => ['index.htm', 'static']})
+      expect(env.static).to eq({'blah.uppercase.no' => ['index.htm', 'static']})
     end
   end
-  describe "#environments" do
+  describe "environments" do
     it "returns all environments" do
       env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'full.yml'), :version => "1foo" )
       expect(env.environments.size).to eq(2)
     end
-  end
-  describe "#environment" do
-    it "returns empty environment if it doesn't exist" do
-      env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'full.yml'), :version => "1foo" )
-      expect(env.environment).to eq({})
-    end
-    it "returns environment if it exists" do
-      env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'full.yml'), :version => "1foo", :environment => "staging")
-      expect(env.environment).to eq({'hosts' => ["staging.uppercase.no"], 'user' => "www-data"})
-    end
-  end
-  describe "#hosts" do
-    it "returns empty list if it doesn't exist" do
-      env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'empty.yml'), :version => "1foo" )
-      expect(env.hosts).to eq([])
-    end
-    it "returns environment if it exists" do
-      env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'full.yml'), :version => "1foo", :environment => "staging")
-      expect(env.environment).to eq({'hosts' => ["staging.uppercase.no"], 'user' => "www-data"})
+    describe "environment" do
+      it "returns empty environment if it doesn't exist" do
+        env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'full.yml'), :version => "1foo" )
+        expect(env.environment).to eq({})
+      end
+      it "returns environment if it exists" do
+        env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'full.yml'), :version => "1foo", :environment => "staging")
+        expect(env.environment).to eq({'hosts' => ["staging.uppercase.no"], 'user' => "www-data"})
+      end
+      describe "hosts" do
+        it "returns empty list if it doesn't exist" do
+          env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'empty.yml'), :version => "1foo" )
+          expect(env.hosts).to eq([])
+        end
+        it "returns environment if it exists" do
+          env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'full.yml'), :version => "1foo", :environment => "staging")
+          expect(env.environment).to eq({'hosts' => ["staging.uppercase.no"], 'user' => "www-data"})
+        end
+      end
     end
   end
 end

data/spec/maven_spec.rb

@@ -27,7 +27,7 @@ describe Pushwagner::Maven do
       expect(m.artifacts["some-notifier"].version).to eq("1.0final")
     end
 
-    describe "initialization of artifacts" do
+    describe "artifacts" do
       it "requires at least one artifact" do
         cfg.delete('artifacts')
         expect {Pushwagner::Maven.new(cfg, "1bar")}.to raise_error(StandardError, "Requires at least one maven artifact")
@@ -35,25 +35,25 @@ describe Pushwagner::Maven do
       it "parses two artifacts" do
         m = Pushwagner::Maven.new(cfg, "1bar")
         expect(m.artifacts.size).to eq(2)
-        expect(m.artifacts.keys.first).to eq("some-api")
-        expect(m.artifacts.keys.last).to eq("some-notifier")
+        expect(m.artifacts.keys).to include("some-api")
+        expect(m.artifacts.keys).to include("some-notifier")
       end
     end
 
-    describe "initialization of repositories" do
-      it "requires snapshots repository" do
+    describe "repositories" do
+      it "requires repositories configuration element" do
         cfg.delete('repositories')
         expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError)
       end
-      it "requires snapshots repository" do
+      it "requires 'snapshots' repository" do
         cfg['repositories'].delete('snapshots')
         expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError)
       end
-      it "requires releases repository" do
+      it "requires 'releases' repository" do
         cfg['repositories'].delete('releases')
         expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError)
       end
-      it "parses repository" do
+      it "parses repositories" do
         m = Pushwagner::Maven.new(cfg, "1")
         expect(m.repository.snapshots_url).to eq("http://w00t.uppercase.no/nexus/content/repositories/snapshots")
         expect(m.repository.releases_url).to eq("http://w00t.uppercase.no/nexus/content/repositories/releases")
@@ -61,7 +61,7 @@ describe Pushwagner::Maven do
     end
   end
 
-  describe "repositories" do
+  describe "repository authentication" do
     let(:settings) {IO.read(File.join(config_root, 'settings.xml'))}
 
     it "reads releases authentication from maven settings.xml" do
@@ -81,7 +81,8 @@ describe Pushwagner::Maven do
 
       expect(m.repository.authentication(true)).to eq("bar:baz")
     end
-
+  end
+  describe "maven2-style repo support" do
     let(:metadata) {IO.read(File.join(config_root, 'maven-metadata.xml'))}
 
     it "builds maven2-repo-style urls and retrieves metadata" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushwagner
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -116,6 +116,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md