knife-opc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ecff3bb04b042ba9a49a4554e851add4d434de
-  data.tar.gz: 464ec5db424d80b2fe59712d493b8d0401d41598
+  metadata.gz: c54f906018c0289af53b226e2c727b05316d7804
+  data.tar.gz: 80b121d10fbedf271168accbb16d4aa3e4d9bf6a
 SHA512:
-  metadata.gz: 834430d0757c6dffd83208127ba461a7954ff2aa22f7e84d4bf9533e90a77e8ad1f8fc3c9c799fc00768d780b7c49894ad2de13c21874455837dbeec261162e9
-  data.tar.gz: 0b33736468f0fa75e85d3118d9a3715faa1d76c8d8ec9fb97b11921a6fac10de05902af8c096584cc0b9c634a648313e4fa40751e2e3a4f29ab4c4dcdafe9700
+  metadata.gz: 2924964157951a54db7916efec203806267910954516e1081559684fb0d3d7e1f52a4cccc18b1bce664db08f2726e44ee190a9e7c53e3d2fa66f828fd6b549cb
+  data.tar.gz: 5bf0cb7097e45c2c8665bf53cb2cce2249f8d422f850ca0bfcc73534868889a7b430b95ba864ce0b18e75d8d1958c70fe6f3b23edbe3487b8c2f256aaef6d3d4

data/lib/chef/knife/opc_org_create.rb

@@ -35,6 +35,7 @@ module Opc
 
     deps do
       require 'chef/org'
+      require 'chef/org/group_operations'
     end
 
     def run

data/lib/chef/knife/opc_org_user_add.rb

@@ -29,6 +29,7 @@ module Opc
 
     deps do
       require 'chef/org'
+      require 'chef/org/group_operations'
     end
 
     def run

data/lib/chef/org.rb

@@ -1,11 +1,13 @@
 require 'chef/json_compat'
 require 'chef/mixin/params_validate'
 require 'chef/rest'
+require 'chef/org/group_operations'
 
 class Chef
   class Org
 
     include Chef::Mixin::ParamsValidate
+    include Chef::Org::GroupOperations
 
     def initialize(name='')
       @name = name
@@ -93,18 +95,6 @@ class Chef
       chef_rest.delete_rest "organizations/#{name}/users/#{username}"
     end
 
-    def add_user_to_group(groupname, username)
-      group = chef_rest.get_rest "organizations/#{name}/groups/#{groupname}"
-      body_hash = {
-        :groupname => "#{groupname}",
-        :actors => {
-          "users" => group["actors"].concat([username]),
-          "groups" => group["groups"]
-        }
-      }
-      chef_rest.put_rest "organizations/#{name}/groups/#{groupname}", body_hash
-    end
-
     # Class methods
     def self.from_hash(org_hash)
       org = Chef::Org.new

data/lib/chef/org/group_operations.rb

@@ -0,0 +1,20 @@
+require 'chef/org'
+
+class Chef
+  class Org
+    module GroupOperations
+      def add_user_to_group(groupname, username)
+        group = chef_rest.get_rest "organizations/#{name}/groups/#{groupname}"
+        body_hash = {
+          :groupname => "#{groupname}",
+          :actors => {
+            "users" => group["actors"].concat([username]),
+            "groups" => group["groups"]
+          }
+        }
+        chef_rest.put_rest "organizations/#{name}/groups/#{groupname}", body_hash
+      end
+    end
+    include Chef::Org::GroupOperations
+  end
+end

data/lib/chef/org/group_operations.rb~

@@ -0,0 +1,21 @@
+require 'chef/org'
+
+class Chef
+  class Org
+    module GroupOperations
+      def add_user_to_group(groupname, username)
+        group = chef_rest.get_rest "organizations/#{name}/groups/#{groupname}"
+        body_hash = {
+          :groupname => "#{groupname}",
+          :actors => {
+            "users" => group["actors"].concat([username]),
+            "groups" => group["groups"]
+          }
+        }
+        chef_rest.put_rest "organizations/#{name}/groups/#{groupname}", body_hash
+      end
+    end
+  end
+
+  include Chef::Org::GroupOperations
+end

data/lib/knife-opc/version.rb

@@ -1,3 +1,3 @@
 module KnifeOPC
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-opc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Steven Danna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,6 +91,8 @@ files:
 - lib/chef/knife/opc_user_password.rb
 - lib/chef/knife/opc_user_show.rb
 - lib/chef/org.rb
+- lib/chef/org/group_operations.rb
+- lib/chef/org/group_operations.rb~
 - lib/knife-opc/version.rb
 homepage: http://wiki.opscode.com/display/chef
 licenses: []