Reviewers: mp+170789_code.launchpad.net,

Message:
Please take a look.

Description:
uniter/jujuc: added arg --all to config-get

Actually config-get behaves different to pyjuju and writes
all configuration keys, even if their value is nil. Now
the default behavior is like in pyjuju, empty values are
filtered. The additional argument --all (or -a) allows
the output of all keys.

https://code.launchpad.net/~themue/juju-core/029-config-get-all/+merge/170789

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/10441044/

Affected files:
   A [revision details]
   M worker/uniter/jujuc/config-get.go
   M worker/uniter/jujuc/config-get_test.go
   M worker/uniter/jujuc/util_test.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20130620172218-jwl9sp71dmuqty4r
+New revision: <email address hidden>

Index: worker/uniter/jujuc/config-get.go
=== modified file 'worker/uniter/jujuc/config-get.go'
--- worker/uniter/jujuc/config-get.go	2013-06-10 21:04:37 +0000
+++ worker/uniter/jujuc/config-get.go	2013-06-21 11:16:43 +0000
@@ -13,6 +13,7 @@
  	cmd.CommandBase
  	ctx Context
  	Key string // The key to show. If empty, show all.
+	all bool
  	out cmd.Output
  }

@@ -31,6 +32,8 @@

  func (c *ConfigGetCommand) SetFlags(f *gnuflag.FlagSet) {
  	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
+	f.BoolVar(&c.all, "a", false, "write also keys without values")
+	f.BoolVar(&c.all, "all", false, "")
  }

  func (c *ConfigGetCommand) Init(args []string) error {
@@ -38,6 +41,7 @@
  		return nil
  	}
  	c.Key = args[0]
+
  	return cmd.CheckEmpty(args[1:])
  }

@@ -48,6 +52,13 @@
  	}
  	var value interface{}
  	if c.Key == "" {
+		if !c.all {
+			for k, v := range settings {
+				if v == nil {
+					delete(settings, k)
+				}
+			}
+		}
  		value = settings
  	} else {
  		value, _ = settings[c.Key]


Index: worker/uniter/jujuc/config-get_test.go
=== modified file 'worker/uniter/jujuc/config-get_test.go'
--- worker/uniter/jujuc/config-get_test.go	2013-05-02 15:55:42 +0000
+++ worker/uniter/jujuc/config-get_test.go	2013-06-21 11:16:43 +0000
@@ -18,7 +18,12 @@

  var _ = Suite(&ConfigGetSuite{})

-var configGetYamlMap = "monsters: false\nspline-reticulation: 45\ntitle:  
My Title\nusername: admin001\n"
+var (
+	configGetYamlMap    = "monsters: false\nspline-reticulation: 45\ntitle:  
My Title\nusername: admin001\n"
+	configGetYamlMapAll = "empty: null\nmonsters: false\nspline-reticulation:  
45\ntitle: My Title\nusername: admin001\n"
+	configGetJsonMap    =  
`{"monsters":false,"spline-reticulation":45,"title":"My  
Title","username":"admin001"}` + "\n"
+	configGetJsonMapAll =  
`{"empty":null,"monsters":false,"spline-reticulation":45,"title":"My  
Title","username":"admin001"}` + "\n"
+)

  var configGetTests = []struct {
  	args []string
@@ -35,7 +40,9 @@
  	{[]string{"--format", "json", "missing"}, "null\n"},
  	{nil, configGetYamlMap},
  	{[]string{"--format", "yaml"}, configGetYamlMap},
-	{[]string{"--format", "json"},  
`{"monsters":false,"spline-reticulation":45,"title":"My  
Title","username":"admin001"}` + "\n"},
+	{[]string{"--format", "json"}, configGetJsonMap},
+	{[]string{"--all", "--format", "yaml"}, configGetYamlMapAll},
+	{[]string{"--all", "--format", "json"}, configGetJsonMapAll},
  }

  func (s *ConfigGetSuite) TestOutputFormat(c *C) {
@@ -63,6 +70,8 @@
  purpose: print service configuration

  options:
+-a, --all  (= false)
+    write also keys without values
  --format  (= smart)
      specify output format (json|smart|yaml)
  -o, --output (= "")


Index: worker/uniter/jujuc/util_test.go
=== modified file 'worker/uniter/jujuc/util_test.go'
--- worker/uniter/jujuc/util_test.go	2013-06-10 21:04:37 +0000
+++ worker/uniter/jujuc/util_test.go	2013-06-21 11:16:43 +0000
@@ -99,6 +99,7 @@

  func (c *Context) ConfigSettings() (charm.Settings, error) {
  	return charm.Settings{
+		"empty":               nil,
  		"monsters":            false,
  		"spline-reticulation": 45.0,
  		"title":               "My Title",