Merge pull request #44 from ipfs/migration-without-path

Migration without path

Author: whyrusleeping

go-migrate/cli.go

@@ -11,12 +11,14 @@ type Flags struct {
 	Revert  bool
 	Path    string // file path to migrate for fs based migrations
 	Verbose bool
+	Help    bool
 }
 
 func (f *Flags) Setup() {
 	flag.BoolVar(&f.Force, "f", false, "whether to force a migration (ignores warnings)")
 	flag.BoolVar(&f.Revert, "revert", false, "whether to apply the migration backwards")
 	flag.BoolVar(&f.Verbose, "verbose", false, "enable verbose logging")
+	flag.BoolVar(&f.Help, "help", false, "display help message")
 	flag.StringVar(&f.Path, "path", "", "file path to migrate for fs based migrations (required)")
 }
 
@@ -29,9 +31,14 @@ func Run(m Migration) error {
 	f.Setup()
 	f.Parse()
 
+	if f.Help {
+		flag.Usage()
+		os.Exit(0)
+	}
+
 	if f.Path == "" {
 		flag.Usage()
-		return nil
+		return fmt.Errorf("missing or empty path; flag '-path <ipfs_path>' is required")
 	}
 
 	if !m.Reversible() {

sharness/t0040-migration-2-3.sh renamed to sharness/t0040-migration-2-to-3.sh

@@ -223,6 +223,10 @@ test_expect_success "get pin lists" '
 	ipfs pin ls --type=indirect | sort > more_start_ind_pins
 '
 
+test_expect_success "'ipfs-3-to-4 -revert' fails without -path" '
+	test_must_fail ipfs-3-to-4 -revert
+'
+
 test_expect_success "'ipfs-3-to-4 -revert' succeeds" '
 	ipfs-3-to-4 -revert -path="$IPFS_PATH" >actual
 '