Merge pull request #193 from jaypipes/pkg-cleanup

move supporting code into separate packages

Author: jaypipes

.travis.yml

@@ -1,4 +1,5 @@
 language: go
+go: "1.13"
 # Using sudo triggers a real virtual machine as opposed to a container, which
 # allows ghw to actually determine things like host memory or block storage...
 sudo: required
@@ -8,36 +9,17 @@ script:
   - go run cmd/ghwc/main.go
 env:
   - GHW_TESTING_SKIP_GPU=1
+  - GO111MODULE="on"
 matrix:
   include:
-    # On Go 1.10 and Go 1.11, use dep to ensure dependencies before running go
-    # test.
-    - os: linux
-      go: "1.10"
-      install:
-        - go get -u github.com/golang/dep/cmd/dep
-        - dep ensure -v
-    - os: linux
-      go: "1.11"
-      install:
-        - go get -u github.com/golang/dep/cmd/dep
-        - dep ensure -v
-    # On Go >=1.12, use go modules to ensure dependencies instead of dep
-    - os: linux
-      go: "1.12"
-      env: GO111MODULE=on
     - os: linux
       go: "1.13"
-      env: GO111MODULE=on
     - os: linux
       go: "1.14.x"
-      env: GO111MODULE=on
 
     # Tests that ghw builds on MacOSX (even though there is currently only
     # support for block devices)
     #- os: osx
-    #  go: "1.12"
-    #  env: GO111MODULE=on
-    #- os: osx
     #  go: "1.13"
-    #  env: GO111MODULE=on
+    #- os: osx
+    #  go: "1.14.x"

Gopkg.lock

@@ -2,20 +2,12 @@ VENDOR := vendor
 PKGS := $(shell go list ./... | grep -v /$(VENDOR)/)
 SRC = $(shell find . -type f -name '*.go' -not -path "*/$(VENDOR)/*")
 BIN_DIR := $(GOPATH)/bin
-DEP := $(BIN_DIR)/dep
 GOMETALINTER := $(BIN_DIR)/gometalinter
 
 .PHONY: test
 test: vet
 	go test $(PKGS)
 
-$(DEP):
-	go get -u github.com/golang/dep/cmd/dep
-
-.PHONY: dep
-dep: $(DEP)
-	$(DEP) ensure
-
 $(GOMETALINTER):
 	go get -u github.com/alecthomas/gometalinter
 	$(GOMETALINTER) --install &> /dev/null

Gopkg.toml

@@ -0,0 +1,139 @@
+//
+// Use and distribution licensed under the Apache license version 2.
+//
+// See the COPYING file in the root project directory for full text.
+//
+
+package ghw
+
+import (
+	"github.com/jaypipes/ghw/pkg/baseboard"
+	"github.com/jaypipes/ghw/pkg/bios"
+	"github.com/jaypipes/ghw/pkg/block"
+	"github.com/jaypipes/ghw/pkg/chassis"
+	"github.com/jaypipes/ghw/pkg/cpu"
+	"github.com/jaypipes/ghw/pkg/gpu"
+	"github.com/jaypipes/ghw/pkg/memory"
+	"github.com/jaypipes/ghw/pkg/net"
+	"github.com/jaypipes/ghw/pkg/option"
+	"github.com/jaypipes/ghw/pkg/pci"
+	"github.com/jaypipes/ghw/pkg/product"
+	"github.com/jaypipes/ghw/pkg/topology"
+)
+
+type WithOption = option.Option
+
+var (
+	WithChroot = option.WithChroot
+)
+
+type CPUInfo = cpu.Info
+
+var (
+	CPU = cpu.New
+)
+
+type MemoryInfo = memory.Info
+type MemoryCacheType = memory.CacheType
+type MemoryModule = memory.Module
+
+const (
+	MEMORY_CACHE_TYPE_UNIFIED     = memory.CACHE_TYPE_UNIFIED
+	MEMORY_CACHE_TYPE_INSTRUCTION = memory.CACHE_TYPE_INSTRUCTION
+	MEMORY_CACHE_TYPE_DATA        = memory.CACHE_TYPE_DATA
+)
+
+var (
+	Memory = memory.New
+)
+
+type BlockInfo = block.Info
+type Disk = block.Disk
+type Partition = block.Partition
+
+var (
+	Block = block.New
+)
+
+type DriveType = block.DriveType
+
+const (
+	DRIVE_TYPE_UNKNOWN = block.DRIVE_TYPE_UNKNOWN
+	DRIVE_TYPE_HDD     = block.DRIVE_TYPE_HDD
+	DRIVE_TYPE_FDD     = block.DRIVE_TYPE_FDD
+	DRIVE_TYPE_ODD     = block.DRIVE_TYPE_ODD
+	DRIVE_TYPE_SSD     = block.DRIVE_TYPE_SSD
+)
+
+type StorageController = block.StorageController
+
+const (
+	STORAGE_CONTROLLER_UNKNOWN = block.STORAGE_CONTROLLER_UNKNOWN
+	STORAGE_CONTROLLER_IDE     = block.STORAGE_CONTROLLER_IDE
+	STORAGE_CONTROLLER_SCSI    = block.STORAGE_CONTROLLER_SCSI
+	STORAGE_CONTROLLER_NVME    = block.STORAGE_CONTROLLER_NVME
+	STORAGE_CONTROLLER_VIRTIO  = block.STORAGE_CONTROLLER_VIRTIO
+	STORAGE_CONTROLLER_MMC     = block.STORAGE_CONTROLLER_MMC
+)
+
+type NetworkInfo = net.Info
+type NIC = net.NIC
+type NICCapability = net.NICCapability
+
+var (
+	Network = net.New
+)
+
+type BIOSInfo = bios.Info
+
+var (
+	BIOS = bios.New
+)
+
+type ChassisInfo = chassis.Info
+
+var (
+	Chassis = chassis.New
+)
+
+type BaseboardInfo = baseboard.Info
+
+var (
+	Baseboard = baseboard.New
+)
+
+type TopologyInfo = topology.Info
+type TopologyNode = topology.Node
+
+var (
+	Topology = topology.New
+)
+
+type Architecture = topology.Architecture
+
+const (
+	ARCHITECTURE_SMP  = topology.ARCHITECTURE_SMP
+	ARCHITECTURE_NUMA = topology.ARCHITECTURE_NUMA
+)
+
+type PCIInfo = pci.Info
+type PCIAddress = pci.Address
+type PCIDevice = pci.Device
+
+var (
+	PCI                  = pci.New
+	PCIAddressFromString = pci.AddressFromString
+)
+
+type ProductInfo = product.Info
+
+var (
+	Product = product.New
+)
+
+type GPUInfo = gpu.Info
+type GraphicsCard = gpu.GraphicsCard
+
+var (
+	GPU = gpu.New
+)