conjur-asset-policy 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5be460276b896a2d3377b538bbcb05b0059d9512
-  data.tar.gz: 1dd881714d5e86b9a23adde4348267641b103a20
+  metadata.gz: a58e3e9c9b42f19ae3269559eb53c9416f735c90
+  data.tar.gz: 13ecf6c9c65fa0a96952db6fe0cc737fb3822896
 SHA512:
-  metadata.gz: 783a3fa548e19d84619f25fa7e48b200215f01f23e276ba2528885017d05c930ea0d17d725b726aad14104c5f903831eac79942410d0615ecbb9d9513bb910d4
-  data.tar.gz: 31e7e8607ce227597099595cfc9e51a7089a437a27184ef987bfae563383229463e2111bc6ed0a2b9359293039f9d4d28ad475b23eb410c87f58ca56ee88c151
+  metadata.gz: 5a74c38f536f5b93ef8c78296cfb034c13c347ceed6db3870de289ad6f78bdf2254acb35d83a6a202f7a72011d8bedba07f4307b5d8914fcdf4c148fb55ac3ba
+  data.tar.gz: 692dd195bd990bbb94c32003a34469d22167d6c972a1918dc83f211fcca7f6347cfc2024cd0ec36d371fc3529f232537bccfcc8ffc189e931971c4208eed730b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.8.0
+
+* **Breaking change** Removed `--syntax` flag from `policy load`. Only YML is supported going forwards.
+* `policy load` writes changes to be made to stderr before making them.
+
 # 0.7.1
 
 * Fix botched gem release.

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "conjur-asset-dsl2"
+require "conjur-asset-policy"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/conjur/command/policy.rb

@@ -21,9 +21,9 @@
 require 'conjur-asset-policy'
 
 class Conjur::Command::Policy < Conjur::DSLCommand
-  def self.load filename, syntax
+  def self.load filename
     script = script_from_filename filename
-    loader(filename, syntax).load script, filename
+    loader.load script, filename
   end
 
   def self.script_from_filename filename
@@ -45,19 +45,8 @@ class Conjur::Command::Policy < Conjur::DSLCommand
     end
   end
 
-  def self.loader filename, syntax
-    if syntax.nil? && filename
-      filename =~ /\.([^.]+)$/
-      syntax = $1
-    end
-    raise "No syntax provided or detected" unless syntax
-    syntax = case syntax
-    when 'yaml', 'yml'
-      'YAML'
-    when 'rb', 'ruby'
-      'Ruby'
-    end
-    mod = Conjur::Policy.const_get syntax
+  def self.loader
+    mod = Conjur::Policy.const_get 'YAML'
     mod.const_get "Loader"
   end
 
@@ -136,9 +125,6 @@ command. Therefore, a policy can be loaded in three steps, if desired:
       c.desc "Policy namespace (optional)"
       c.flag [:namespace]
 
-      c.desc "Syntax (ruby or YAML, will be auto-detected from file extension)"
-      c.flag [:syntax]
-
       c.desc "Print the actions that would be performed"
       c.switch [:"dry-run"]
 
@@ -156,7 +142,7 @@ command. Therefore, a policy can be loaded in three steps, if desired:
         Conjur.log = "stderr"
 
         filename = args.pop
-        records = load filename, options[:syntax]
+        records = load filename
 
         ownerid = options[:ownerid]
         unless ownerid
@@ -179,6 +165,7 @@ command. Therefore, a policy can be loaded in three steps, if desired:
             puts plan.actions.to_yaml
           end
         else
+          $stderr.puts plan.actions.map(&:to_s)
           context = execute api, plan.actions
 
           if options[:context]

data/lib/conjur/policy/types/policy.rb

@@ -5,16 +5,16 @@ module Conjur
         def tag
           [ "!", self.class.name.split("::")[-1].underscore ].join
         end
-        
+
         def encode_with coder
           coder.represent_seq tag, self
         end
       end
-      
+
       module Tagless
         def tag; nil; end
       end
-      
+
       module CustomStatement
         def custom_statement handler, &block
           record = yield
@@ -25,67 +25,67 @@ module Conjur
           do_scope record, &handler
         end
       end
-      
+
       module Grants
         include CustomStatement
-        
+
         def grant &block
           custom_statement(block) do
             Conjur::Policy::Types::Grant.new
           end
         end
-        
+
         def revoke &block
           custom_statement(block) do
             Conjur::Policy::Types::Revoke.new
           end
         end
       end
-      
+
       module Permissions
         include CustomStatement
-        
+
         def permit privilege, &block
           custom_statement(block) do
             Conjur::Policy::Types::Permit.new(privilege)
           end
         end
-        
+
         def give &block
           custom_statement(block) do
             Conjur::Policy::Types::Give.new
           end
         end
-        
+
         def retire &block
           custom_statement(block) do
             Conjur::Policy::Types::Retire.new
           end
         end
       end
-      
+
       # Entitlements will allow creation of any record, as well as declaration
       # of permit, deny, grant and revoke.
       class Entitlements < YAMLList
         include Tagless
         include Grants
         include Permissions
-        
+
         def policy id=nil, &block
           policy = Policy.new
           policy.id(id) unless id.nil?
           push policy
-  
+
           do_scope policy, &block
         end
       end
-      
+
       class Body < YAMLList
         include Grants
         include Permissions
       end
-      
-      # Policy includes the functionality of Entitlements, wrapped in a 
+
+      # Policy includes the functionality of Entitlements, wrapped in a
       # policy role, policy resource, policy id and policy version.
       class Policy < Record
         include ActsAsResource
@@ -100,7 +100,8 @@ Create a versioned policy.
         self.example = %(
 - !user operator
 
-- !policy example/v1
+- !policy
+    id: example/v1
     owner: !user operator
     body:
     - !variable secret
@@ -109,7 +110,7 @@ Create a versioned policy.
         permissions: [ read, execute, update ]
         resource: !variable secret
 )
-        
+
         def role
           raise "account is nil" unless account
           @role ||= Role.new("#{account}:policy:#{id}").tap do |role|
@@ -123,25 +124,25 @@ Create a versioned policy.
             resource.owner = Role.new(role.roleid)
           end
         end
-        
+
         # Body is handled specially.
         def referenced_records
           super - Array(@body)
         end
-        
+
         def body &block
           if block_given?
             singleton :body, lambda { Body.new }, &block
           end
           @body
         end
-        
+
         def body= body
           @body = body
         end
-        
+
         protected
-        
+
         def singleton id, factory, &block
           object = instance_variable_get("@#{id}")
           unless object

data/lib/conjur-asset-policy-version.rb

@@ -1,7 +1,7 @@
 module Conjur
   module Asset
     module Policy
-      VERSION = "0.7.1"
+      VERSION = "0.8.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-asset-policy
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml