librarian-ansible 1.0.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c8d1017901562889ad9a7037f3fc503cadf518
-  data.tar.gz: 640bcfe4416e2cc3ff0bab763c7da9fb72a73b05
+  metadata.gz: 0683e7fc9b74bcea066972c85e9f7fbbff517afb
+  data.tar.gz: 763e25bb2ce03666350d38404d3727d2f36b4730
 SHA512:
-  metadata.gz: 5d799b4e7a4cae5deddd9379c70ee53c28b6e709d9c32d2f8d87816cbc5ed23e241afc013cbd8dcccbca1df842f7b9456eefc006dfcef146802aa9e6cbb73e41
-  data.tar.gz: 6970dac352e1426e85c1a516e0196486fbe6eb9a52a3742fceb6584912102c4dfb1d3c831383d8af619e3031c1feced49f20df4df37fe925fed4c04d730d14cd
+  metadata.gz: 4c12598b8cd93c8aa75266038dc25621d0c19fa6fbd8c90898d571c06c5d5da4f7b9cf963d486c33297689c348625451bf4750f9422fa878e69e30ebbf993811
+  data.tar.gz: 360b30fbbec8de2dda91347910b4ea22dc46efa18999d7d2f1835c535dc54926235542eeb75a9fa487b116985e14dac464659fb22c6c86a3b042e109b57c5da2

data/README.md

@@ -180,6 +180,9 @@ Configuration can be set by passing specific options to other commands.
   the `--strip-dot-git` option to the `install` command. It can be unset at the
   local level by passing the `--no-strip-dot-git` option.
 
+Note that the directories will be purged if you run librarian-ansible with the
+--clean or --destructive flags.
+
 ## Contributing
 
 1. Fork it ( http://github.com/bcoe/librarian-ansible/fork )

data/lib/librarian/ansible.rb

@@ -1 +1,2 @@
 require 'librarian/ansible/extension'
+require 'librarian/action/install'

data/lib/librarian/ansible/action.rb

@@ -0,0 +1 @@
+require "librarian/ansible/action/install"

data/lib/librarian/ansible/action/install.rb

@@ -0,0 +1,22 @@
+require 'librarian/action/install'
+
+module Librarian
+  module Ansible
+    module Action
+      class Install < Librarian::Action::Install
+
+        private
+
+        def create_install_path
+          install_path.rmtree if install_path.exist? && destructive?
+          install_path.mkpath
+        end
+
+        def destructive?
+          environment.config_db.local['destructive'] == 'true'
+        end
+
+      end
+    end
+  end
+end

data/lib/librarian/ansible/cli.rb

@@ -2,6 +2,7 @@ require 'librarian/helpers'
 
 require 'librarian/cli'
 require 'librarian/ansible'
+require 'librarian/ansible/action'
 
 module Librarian
   module Ansible
@@ -28,9 +29,13 @@ module Librarian
       option "clean", :type => :boolean, :default => false
       option "strip-dot-git", :type => :boolean
       option "path", :type => :string
+      option "destructive", :type => :boolean, :default => false
       def install
         ensure!
         clean! if options["clean"]
+        unless options["destructive"].nil?
+          environment.config_db.local['destructive'] = options['destructive'].to_s
+        end
         if options.include?("strip-dot-git")
           strip_dot_git_val = options["strip-dot-git"] ? "1" : nil
           environment.config_db.local["install.strip-dot-git"] = strip_dot_git_val
@@ -38,10 +43,18 @@ module Librarian
         if options.include?("path")
           environment.config_db.local["path"] = options["path"]
         end
+
         resolve!
         install!
       end
 
+      private
+
+      # override the actions to use our own
+
+      def install!(options = { })
+        Action::Install.new(environment, options).run
+      end
     end
   end
 end

data/lib/librarian/ansible/extension.rb

@@ -1,4 +1,5 @@
 require 'librarian/ansible/environment'
+require 'librarian/action/base'
 
 module Librarian
   module Ansible

data/lib/librarian/ansible/source/galaxy.rb

@@ -55,7 +55,7 @@ module Librarian
               else
                 json = JSON.parse(response.body)
                 package = json['results'].find do |r|
-                  r['summary_fields']['owner']['username'] == username &&
+                  r['namespace'] == username &&
                     r['name'] == name
                 end
                 return package if package

data/lib/librarian/ansible/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Ansible
-    VERSION = "1.0.6"
+    VERSION = "2.0.0"
   end
 end

data/spec/integration/ansible/source/git_spec.rb

@@ -81,12 +81,12 @@ module Librarian
 
             context "the resolve" do
               it "should not raise an exception" do
-                expect { Action::Resolve.new(env).run }.to_not raise_error
+                expect { Librarian::Action::Resolve.new(env).run }.to_not raise_error
               end
             end
 
             context "the results" do
-              before { Action::Resolve.new(env).run }
+              before { Librarian::Action::Resolve.new(env).run }
 
               it "should create the lockfile" do
                 repo_path.join("Ansiblefile.lock").should exist
@@ -110,7 +110,7 @@ module Librarian
               ANSIBLEFILE
               repo_path.join("Ansiblefile").open("wb") { |f| f.write(ansiblefile) }
 
-              Action::Resolve.new(env).run
+              Librarian::Action::Resolve.new(env).run
             end
 
             context "the install" do
@@ -148,7 +148,7 @@ module Librarian
               ANSIBLEFILE
               repo_path.join("Ansiblefile").open("wb") { |f| f.write(ansiblefile) }
 
-              Action::Resolve.new(env).run
+              Librarian::Action::Resolve.new(env).run
               repo_path.join("tmp").rmtree if repo_path.join("tmp").exist?
             end
 
@@ -210,7 +210,7 @@ module Librarian
             end
 
             it "should not resolve" do
-              expect{ Action::Resolve.new(env).run }.to raise_error
+              expect{ Librarian::Action::Resolve.new(env).run }.to raise_error
             end
           end
 
@@ -230,7 +230,7 @@ module Librarian
             end
 
             it "should not resolve" do
-              expect{ Action::Resolve.new(env).run }.to raise_error
+              expect{ Librarian::Action::Resolve.new(env).run }.to raise_error
             end
           end
 
@@ -251,12 +251,12 @@ module Librarian
 
             context "the resolve" do
               it "should not raise an exception" do
-                expect { Action::Resolve.new(env).run }.to_not raise_error
+                expect { Librarian::Action::Resolve.new(env).run }.to_not raise_error
               end
             end
 
             context "the results" do
-              before { Action::Resolve.new(env).run }
+              before { Librarian::Action::Resolve.new(env).run }
 
               it "should create the lockfile" do
                 repo_path.join("Ansiblefile.lock").should exist
@@ -307,7 +307,7 @@ module Librarian
                 :ref => "some-branch"
             ANSIBLEFILE
             repo_path.join("Ansiblefile").open("wb") { |f| f.write(ansiblefile) }
-            Action::Resolve.new(env).run
+            Librarian::Action::Resolve.new(env).run
 
             # change the upstream copy of that branch: we expect to be able to pull the latest
             # when we re-resolve
@@ -326,7 +326,7 @@ module Librarian
 
           context "when updating not a role from that source" do
             before do
-              Action::Update.new(env).run
+              Librarian::Action::Update.new(env).run
             end
 
             it "should pull the tip from upstream" do
@@ -341,7 +341,7 @@ module Librarian
 
           context "when updating a role from that source" do
             before do
-              Action::Update.new(env, :names => %w(sample)).run
+              Librarian::Action::Update.new(env, :names => %w(sample)).run
             end
 
             it "should pull the tip from upstream" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librarian-ansible
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Benjamin Coe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -85,6 +85,8 @@ files:
 - lib/ext/librarian/lockfile/parser.rb
 - lib/librarian-ansible.rb
 - lib/librarian/ansible.rb
+- lib/librarian/ansible/action.rb
+- lib/librarian/ansible/action/install.rb
 - lib/librarian/ansible/cli.rb
 - lib/librarian/ansible/dsl.rb
 - lib/librarian/ansible/environment.rb
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Bundler for your Ansible roles.