Merge pull request #4123 from sherodtaylor/feature/tour/remove-tour

remove tour command from ipfs
ipfs · Aug 16, 2017 · 9ea02e9 · 9ea02e9
2 parents 69bc94e + bc75d3b
commit 9ea02e9
Show file tree

Hide file tree

Showing 20 changed files with 43 additions and 732 deletions.
diff --git a/assets/assets.go b/assets/assets.go
@@ -1,4 +1,4 @@
-//go:generate go-bindata -pkg=assets -prefix=$GOPATH/src/gx/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T init-doc $GOPATH/src/gx/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T/dir-index-html
+//go:generate go-bindata -pkg=assets -prefix=$GOPATH/src/gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1 init-doc $GOPATH/src/gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1/dir-index-html
 //go:generate gofmt -w bindata.go
 
 package assets
@@ -34,7 +34,7 @@ func SeedInitDocs(nd *core.IpfsNode) (*cid.Cid, error) {
 	return addAssetList(nd, initDocPaths)
 }
 
-var initDirPath = filepath.Join(os.Getenv("GOPATH"), "gx", "ipfs", "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T", "dir-index-html")
+var initDirPath = filepath.Join(os.Getenv("GOPATH"), "gx", "ipfs", "QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1", "dir-index-html")
 var initDirIndex = []string{
 	filepath.Join(initDirPath, "knownIcons.txt"),
 	filepath.Join(initDirPath, "dir-index.html"),

diff --git a/assets/assets_test.go b/assets/assets_test.go
@@ -9,7 +9,7 @@ import (
 
 // TestEmbeddedDocs makes sure we don't forget to regenerate after documentation change
 func TestEmbeddedDocs(t *testing.T) {
-	testNFiles(initDocPaths, 6, t, "documents")
+	testNFiles(initDocPaths, 5, t, "documents")
 }
 
 func TestDirIndex(t *testing.T) {

diff --git a/assets/bindata.go b/assets/bindata.go
diff --git a/assets/init-doc/quick-start b/assets/init-doc/quick-start
@@ -1,7 +1,7 @@
 # 0.1 - Quick Start
 
 This is a set of short examples with minimal explanation. It is meant as
-a "quick start". Soon, we'll write a longer tour :-)
+a "quick start".
 
 
 Add a file to ipfs:

diff --git a/assets/init-doc/tour/0.0-intro b/assets/init-doc/tour/0.0-intro
diff --git a/core/commands/root.go b/core/commands/root.go
@@ -122,7 +122,6 @@ var rootSubcommands = map[string]*cmds.Command{
 	"stats":     StatsCmd,
 	"swarm":     SwarmCmd,
 	"tar":       TarCmd,
-	"tour":      tourCmd,
 	"file":      unixfs.UnixFSCmd,
 	"update":    ExternalBinary(),
 	"version":   VersionCmd,

diff --git a/core/commands/tour.go b/core/commands/tour.go
diff --git a/core/commands/tour_test.go b/core/commands/tour_test.go
diff --git a/docs/config.md b/docs/config.md
@@ -18,7 +18,6 @@ a running daemon do not read the config file at runtime.
 - [`ReproviderInterval`](#reproviderinterval)
 - [`SupernodeRouting`](#supernoderouting)
 - [`Swarm`](#swarm)
-- [`Tour`](#tour)
 
 ## `Addresses`
 Contains information about various listener addresses to be used by this node.
@@ -221,5 +220,3 @@ improvement, as well as a reduction in memory usage.
 - `DisableNatPortMap`
 Disable NAT discovery.
 
-## `Tour`
-Unused.
diff --git a/misc/completion/ipfs-completion.bash b/misc/completion/ipfs-completion.bash
@@ -811,26 +811,6 @@ _ipfs_tar_cat()
     fi
 }
 
-_ipfs_tour()
-{
-    _ipfs_comp "list next restart --help"
-}
-
-_ipfs_tour_list()
-{
-    _ipfs_help_only
-}
-
-_ipfs_tour_next()
-{
-    _ipfs_help_only
-}
-
-_ipfs_tour_restart()
-{
-    _ipfs_help_only
-}
-
 _ipfs_update()
 {
     if [[ ${word} == -* ]] ; then
@@ -964,7 +944,7 @@ _ipfs()
         1)
             local opts="add bitswap block bootstrap cat commands config daemon dag dht \
                         diag dns file files get id init log ls mount name object pin ping pubsub \
-                        refs repo resolve stats swarm tar tour update version"
+                        refs repo resolve stats swarm tar update version"
             COMPREPLY=( $(compgen -W "${opts}" -- ${word}) );;
         2)
             local command="${COMP_WORDS[1]}"

diff --git a/repo/config/config.go b/repo/config/config.go
@@ -21,7 +21,6 @@ type Config struct {
 	Discovery        Discovery             // local node's discovery mechanisms
 	Ipns             Ipns                  // Ipns settings
 	Bootstrap        []string              // local nodes's bootstrap peer addresses
-	Tour             Tour                  // local node's tour position
 	Gateway          Gateway               // local node's gateway server options
 	SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
 	API              API                   // local node's API settings

diff --git a/repo/config/tour.go b/repo/config/tour.go
diff --git a/test/3nodetest/bootstrap/config b/test/3nodetest/bootstrap/config
@@ -25,8 +25,5 @@
     "AutoUpdate": "minor"
   },
   "Bootstrap": [
-  ],
-  "Tour": {
-    "Last": ""
-  }
+  ]
 }
diff --git a/test/3nodetest/client/config b/test/3nodetest/client/config
@@ -19,9 +19,6 @@
         "IPFS": "/ipfs",
         "IPNS": "/ipns"
     },
-    "Tour": {
-        "Last": ""
-    },
     "Version": {
         "AutoUpdate": "minor",
         "Check": "error",