Mark context and target as namevars (GH #3)

Add title_patterns

lib/puppet/type/apache_directive.rb

@@ -33,6 +33,7 @@ def insync?(is)
 
   newparam(:context) do
     desc 'The path where the directive is located. Expressed as an Augeas path expression.'
+    isnamevar
     defaultto ''
   end
 
@@ -51,5 +52,40 @@ def insync?(is)
 
   newparam(:target) do
     desc 'The config file to use'
+    isnamevar
+  end
+
+  def self.title_patterns
+    identity = lambda { |x| x }
+    [
+      [
+        /^(\S+)\s+from\s+(\S+)\s+in\s+(.*)$/,
+        [
+          [ :name, identity ],
+          [ :context, identity ],
+          [ :target, identity ],
+        ]
+      ],
+      [
+        /^(\S+)\s+from\s+(\S+)$/,
+        [
+          [ :name, identity ],
+          [ :context, identity ],
+        ]
+      ],
+      [
+        /^(\S+)\s+in\s+(.*)$/,
+        [
+          [ :name, identity ],
+          [ :target, identity ],
+        ]
+      ],
+      [
+        /(.*)/,
+        [
+          [ :name, identity ],
+        ]
+      ]
+    ]
   end
 end

spec/fixtures/unit/puppet/provider/apache_directive/augeas/full

@@ -140,6 +140,9 @@ KeepAliveTimeout 5
     MaxRequestsPerChild   0
 </IfModule>
 
+<IfModule ssl_module>
+</IfModule>
+
 # These need to be set in /etc/apache2/envvars
 User ${APACHE_RUN_USER}
 Group ${APACHE_RUN_GROUP}

spec/unit/puppet/provider/apache_directive/augeas_spec.rb

@@ -105,6 +105,25 @@
           { "directive" = "Example" }
         ')
       end
+
+      it "should fail with same name" do
+        expect do
+          apply!(
+           Puppet::Type.type(:apache_directive).new(
+              :name      => "Listen",
+              :args      => "80",
+              :target    => target,
+              :provider  => "augeas"
+            ),
+            Puppet::Type.type(:apache_directive).new(
+              :name      => "Listen",
+              :args      => "443",
+              :target    => target,
+              :provider  => "augeas"
+            )
+          )
+        end.to raise_error(Puppet::Resource::Catalog::DuplicateResourceError)
+      end
     end
 
     context "when creating with context" do
@@ -167,6 +186,28 @@
           aug.get("IfModule[arg='mpm_worker_module']/directive[.='StartServers']/arg").should == '2'
         end
       end
+
+      it "should not fail with different names and different context" do
+        expect do
+          apply!(
+            Puppet::Type.type(:apache_directive).new(
+              :title     => "Listen80",
+              :name      => "Listen",
+              :args      => "80",
+              :target    => target,
+              :provider  => "augeas"
+            ),
+            Puppet::Type.type(:apache_directive).new(
+              :title     => "Listen443",
+              :name      => "Listen",
+              :args      => "443",
+              :context   => 'IfModule[arg="ssl_module"]',
+              :target    => target,
+              :provider  => "augeas"
+            )
+          )
+        end.not_to raise_error
+      end
     end
   end