rewrites resource generator with genny (#1521)

buffalo/cmd/filetests/generate_resource_nested_api.json

@@ -15,8 +15,6 @@
   },
   {
     "path": "locales/admin/planes.en-us.yaml",
-    "contains": [
-      "translation: \"Plane was successfully created.\""
-    ]
+    "absent": true
   }
 ]

buffalo/cmd/filetests/generate_resource_nested_model_name_api.json

@@ -14,9 +14,7 @@
   },
   {
     "path": "locales/admin/users.en-us.yaml",
-    "contains": [
-      "translation: \"AdminUser was successfully created.\""
-    ]
+    "absent": true
   },
   {
     "path": "models/admin_user.go",

buffalo/cmd/generate/resource.go

@@ -1,21 +1,23 @@
 package generate
 
 import (
-	"github.com/pkg/errors"
+	"context"
 
-	"github.com/gobuffalo/buffalo/generators/resource"
-	"github.com/gobuffalo/flect/name"
-	"github.com/gobuffalo/makr"
+	"github.com/gobuffalo/buffalo/genny/resource"
+	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/movinglater/attrs"
+	"github.com/gobuffalo/logger"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
 var resourceOptions = struct {
-	SkipMigration bool
-	SkipModel     bool
-	SkipTemplates bool
-	ModelName     string
-	Name          string
-}{}
+	*resource.Options
+	Verbose bool
+	DryRun  bool
+}{
+	Options: &resource.Options{},
+}
 
 // ResourceCmd generates a new actions/resource file and a stub test.
 var ResourceCmd = &cobra.Command{
@@ -24,35 +26,44 @@ var ResourceCmd = &cobra.Command{
 	Aliases: []string{"r"},
 	Short:   "Generate a new actions/resource file",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		o, err := resource.New(resourceOptions.Name, args...)
-		if err != nil {
-			return errors.WithStack(err)
+		if len(args) == 0 {
+			return errors.New("you must supply a name")
+		}
+		ctx := context.Background()
+		run := genny.WetRunner(ctx)
+		if resourceOptions.DryRun {
+			run = genny.DryRunner(ctx)
 		}
-		if o.App.AsAPI {
-			resourceOptions.SkipTemplates = true
+
+		if resourceOptions.Verbose {
+			lg := logger.New(logger.DebugLevel)
+			run.Logger = lg
+		}
+
+		if len(resourceOptions.Name) == 0 {
+			resourceOptions.Name = args[0]
 		}
-		o.SkipModel = resourceOptions.SkipModel
-		o.SkipMigration = resourceOptions.SkipMigration
-		o.SkipTemplates = resourceOptions.SkipTemplates
-		if resourceOptions.ModelName != "" {
-			o.UseModel = true
-			o.Model = name.New(resourceOptions.ModelName)
+		ats, err := attrs.ParseArgs(args[0:]...)
+		if err != nil {
+			return errors.WithStack(err)
 		}
+		resourceOptions.Attrs = ats
 
-		if err := o.Validate(); err != nil {
+		if err := run.WithNew(resource.New(resourceOptions.Options)); err != nil {
 			return err
 		}
-
-		return o.Run(".", makr.Data{})
+		return run.Run()
 	},
 }
 
 func init() {
 	ResourceCmd.Flags().BoolVarP(&resourceOptions.SkipMigration, "skip-migration", "s", false, "tells resource generator not-to add model migration")
 	ResourceCmd.Flags().BoolVarP(&resourceOptions.SkipModel, "skip-model", "", false, "tells resource generator not to generate model nor migrations")
 	ResourceCmd.Flags().BoolVarP(&resourceOptions.SkipTemplates, "skip-templates", "", false, "tells resource generator not to generate templates for the resource")
-	ResourceCmd.Flags().StringVarP(&resourceOptions.ModelName, "use-model", "", "", "tells resource generator to reference an existing model in generated code")
+	ResourceCmd.Flags().StringVarP(&resourceOptions.Model, "use-model", "", "", "tells resource generator to reference an existing model in generated code")
 	ResourceCmd.Flags().StringVarP(&resourceOptions.Name, "name", "n", "", "allows to define a different model name for the resource being generated.")
+	ResourceCmd.Flags().BoolVarP(&resourceOptions.DryRun, "dry-run", "d", false, "dry run")
+	ResourceCmd.Flags().BoolVarP(&resourceOptions.Verbose, "verbose", "v", false, "verbosely print out the go get commands")
 }
 
 const resourceExamples = `$ buffalo g resource users