Skip to content

Commit

Permalink
change: module and paths from dev to CLIP-HPC repo
Browse files Browse the repository at this point in the history
  • Loading branch information
pja237 committed Dec 19, 2022
1 parent b8ae28b commit ad4be14
Show file tree
Hide file tree
Showing 36 changed files with 95 additions and 95 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# ...in github actions comes from make -e version=git_ref
version=$(shell cat VERSION)
commit=$(shell git show --no-patch --format=format:%H HEAD)
buildVersionVar=github.com/pja237/slurmcommander-dev/internal/version.BuildVersion
buildCommitVar=github.com/pja237/slurmcommander-dev/internal/version.BuildCommit
buildVersionVar=github.com/CLIP-HPC/SlurmCommander/internal/version.BuildVersion
buildCommitVar=github.com/CLIP-HPC/SlurmCommander/internal/version.BuildCommit

# various directories
bindirs=$(wildcard ./cmd/*)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
SlurmCommander is a simple, lightweight, no-dependencies text-based user interface (TUI) to your cluster.
It ties together multiple slurm commands to provide you with a simple and efficient interaction point with slurm.

Installation does not require any special privileges or environment. Simply download the [binary](https://github.com/pja237/SlurmCommander-dev/releases/latest), fill out a small [config file](./cmd/scom/scom.conf) and it's ready to run.
Installation does not require any special privileges or environment. Simply download the [binary](https://github.com/CLIP-HPC/SlurmCommander/releases/latest), fill out a small [config file](./cmd/scom/scom.conf) and it's ready to run.

You can view, search, analyze and interact with:

Expand All @@ -27,7 +27,7 @@ SlurmCommander does not require any special privileges to be installed, see inst
### Regular users

1. Download the pre-built [binary](https://github.com/pja237/SlurmCommander-dev/releases/latest)
1. Download the pre-built [binary](https://github.com/CLIP-HPC/SlurmCommander/releases/latest)
2. Download the [annotated config](./cmd/scom/scom.conf) file
3. Edit the config file, follow instructions inside
4. Create scom directory in your $HOME and place the edited config there: `mkdir $HOME/scom`
Expand Down
26 changes: 13 additions & 13 deletions cmd/scom/scom.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import (
"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"github.com/pja237/slurmcommander-dev/internal/cmdline"
"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/config"
"github.com/pja237/slurmcommander-dev/internal/logger"
"github.com/pja237/slurmcommander-dev/internal/model"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/clustertab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobdetailstab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobfromtemplate"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobhisttab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobtab"
"github.com/pja237/slurmcommander-dev/internal/styles"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/pja237/slurmcommander-dev/internal/version"
"github.com/CLIP-HPC/SlurmCommander/internal/cmdline"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/config"
"github.com/CLIP-HPC/SlurmCommander/internal/logger"
"github.com/CLIP-HPC/SlurmCommander/internal/model"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/clustertab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobdetailstab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobfromtemplate"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobhisttab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobtab"
"github.com/CLIP-HPC/SlurmCommander/internal/styles"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/version"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/pja237/slurmcommander-dev
module github.com/CLIP-HPC/SlurmCommander

go 1.18

Expand Down
4 changes: 2 additions & 2 deletions internal/command/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os/user"

tea "github.com/charmbracelet/bubbletea"
"github.com/pja237/slurmcommander-dev/internal/config"
"github.com/CLIP-HPC/SlurmCommander/internal/config"
)

var cc config.ConfigContainer
Expand Down Expand Up @@ -41,7 +41,7 @@ func GetUserName(l *log.Logger) tea.Cmd {
l.Printf("GetUserName FAILED: %s", err)
return ErrorMsg{
From: "GetUserName",
ErrHelp: "Failed to get username, hard to imagine why. Please open an issue with us here: https://github.com/pja237/SlurmCommander-dev/issues/new/choose",
ErrHelp: "Failed to get username, hard to imagine why. Please open an issue with us here: https://github.com/CLIP-HPC/SlurmCommander/issues/new/choose",
OrigErr: err,
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/pja237/slurmcommander-dev/internal/defaults"
"github.com/CLIP-HPC/SlurmCommander/internal/defaults"
)

type ConfigContainer struct {
Expand Down
8 changes: 4 additions & 4 deletions internal/model/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package model

import (
tea "github.com/charmbracelet/bubbletea"
"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/clustertab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobfromtemplate"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobtab"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/clustertab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobfromtemplate"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobtab"
)

func (m Model) Init() tea.Cmd {
Expand Down
14 changes: 7 additions & 7 deletions internal/model/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"log"

"github.com/charmbracelet/bubbles/help"
"github.com/pja237/slurmcommander-dev/internal/config"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/abouttab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/clustertab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobdetailstab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobfromtemplate"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobhisttab"
"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobtab"
"github.com/CLIP-HPC/SlurmCommander/internal/config"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/abouttab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/clustertab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobdetailstab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobfromtemplate"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobhisttab"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobtab"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/abouttab/abouttab.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package abouttab

import (
"github.com/charmbracelet/bubbles/key"
"github.com/pja237/slurmcommander-dev/internal/keybindings"
"github.com/CLIP-HPC/SlurmCommander/internal/keybindings"
)

type Keys map[*key.Binding]bool
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/clustertab/clustertab.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/charmbracelet/bubbles/progress"
"github.com/charmbracelet/bubbles/textinput"
"github.com/pja237/slurmcommander-dev/internal/generic"
"github.com/pja237/slurmcommander-dev/internal/slurm"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/generic"
"github.com/CLIP-HPC/SlurmCommander/internal/slurm"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
)

type ClusterTab struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/clustertab/clustertabcommands.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

tea "github.com/charmbracelet/bubbletea"
"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/config"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/config"
)

var (
Expand Down Expand Up @@ -38,7 +38,7 @@ func GetSinfo(t time.Time) tea.Msg {
if err != nil {
return command.ErrorMsg{
From: "GetSinfo",
ErrHelp: "sinfo JSON failed to parse, note your slurm version and open an issue with us here: https://github.com/pja237/SlurmCommander-dev/issues/new/choose",
ErrHelp: "sinfo JSON failed to parse, note your slurm version and open an issue with us here: https://github.com/CLIP-HPC/SlurmCommander/issues/new/choose",
OrigErr: err,
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/clustertab/clustertabkeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package clustertab

import (
"github.com/charmbracelet/bubbles/key"
"github.com/pja237/slurmcommander-dev/internal/keybindings"
"github.com/CLIP-HPC/SlurmCommander/internal/keybindings"
)

type Keys map[*key.Binding]bool
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/clustertab/clustertabtable.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"strings"

"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/slurm"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/slurm"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/clustertab/clustertabview.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/charmbracelet/bubbles/progress"
"github.com/charmbracelet/lipgloss"
"github.com/dustin/go-humanize"
"github.com/pja237/slurmcommander-dev/internal/generic"
"github.com/pja237/slurmcommander-dev/internal/slurm"
"github.com/pja237/slurmcommander-dev/internal/styles"
"github.com/CLIP-HPC/SlurmCommander/internal/generic"
"github.com/CLIP-HPC/SlurmCommander/internal/slurm"
"github.com/CLIP-HPC/SlurmCommander/internal/styles"
)

func (ct *ClusterTab) tabCluster() string {
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/jobdetailstab/jobdetailstab.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package jobdetailstab

import (
"github.com/charmbracelet/bubbles/viewport"
"github.com/pja237/slurmcommander-dev/internal/slurm"
"github.com/CLIP-HPC/SlurmCommander/internal/slurm"
)

type JobDetailsTab struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/jobdetailstab/jobdetailstabkeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package jobdetailstab

import (
"github.com/charmbracelet/bubbles/key"
"github.com/pja237/slurmcommander-dev/internal/keybindings"
"github.com/CLIP-HPC/SlurmCommander/internal/keybindings"
)

type Keys map[*key.Binding]bool
Expand Down
4 changes: 2 additions & 2 deletions internal/model/tabs/jobdetailstab/jobdetailstabview.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"time"

"github.com/pja237/slurmcommander-dev/internal/model/tabs/jobhisttab"
"github.com/pja237/slurmcommander-dev/internal/styles"
"github.com/CLIP-HPC/SlurmCommander/internal/model/tabs/jobhisttab"
"github.com/CLIP-HPC/SlurmCommander/internal/styles"
)

func (jd *JobDetailsTab) tabJobDetails(jh *jobhisttab.JobHistTab, l *log.Logger) (scr string) {
Expand Down
4 changes: 2 additions & 2 deletions internal/model/tabs/jobfromtemplate/jobfromtemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/charmbracelet/bubbles/textarea"
tea "github.com/charmbracelet/bubbletea"
"github.com/pja237/slurmcommander-dev/internal/defaults"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/defaults"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
)

type JobFromTemplateTab struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/jobfromtemplate/jobfromtemplatekeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package jobfromtemplate

import (
"github.com/charmbracelet/bubbles/key"
"github.com/pja237/slurmcommander-dev/internal/keybindings"
"github.com/CLIP-HPC/SlurmCommander/internal/keybindings"
)

type Keys map[*key.Binding]bool
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/jobfromtemplate/jobfromtemplateview.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"log"
"strings"

"github.com/pja237/slurmcommander-dev/internal/styles"
"github.com/CLIP-HPC/SlurmCommander/internal/styles"
)

func (jft *JobFromTemplateTab) tabJobFromTemplate() string {
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/jobhisttab/jobhisttab.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"time"

"github.com/charmbracelet/bubbles/textinput"
"github.com/pja237/slurmcommander-dev/internal/generic"
"github.com/pja237/slurmcommander-dev/internal/stats"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/generic"
"github.com/CLIP-HPC/SlurmCommander/internal/stats"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
)

type JobHistTab struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/jobhisttab/jobhisttabcommands.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

tea "github.com/charmbracelet/bubbletea"
"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/config"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/config"
)

var (
Expand Down Expand Up @@ -64,7 +64,7 @@ func GetSacctHist(uaccs string, d uint, t uint, l *log.Logger) tea.Cmd {
l.Printf("Error unmarshall: %q\n", err)
return command.ErrorMsg{
From: "GetSacctHist",
ErrHelp: "sacct JSON failed to parse, note your slurm version and open an issue with us here: https://github.com/pja237/SlurmCommander-dev/issues/new/choose",
ErrHelp: "sacct JSON failed to parse, note your slurm version and open an issue with us here: https://github.com/CLIP-HPC/SlurmCommander/issues/new/choose",
OrigErr: err,
}
//return jht
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/jobhisttab/jobhisttabkeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package jobhisttab

import (
"github.com/charmbracelet/bubbles/key"
"github.com/pja237/slurmcommander-dev/internal/keybindings"
"github.com/CLIP-HPC/SlurmCommander/internal/keybindings"
)

type Keys map[*key.Binding]bool
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/jobhisttab/jobhisttabtable.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"strings"

"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/slurm"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/slurm"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
)

var SacctTabCols = []table.Column{
Expand Down
4 changes: 2 additions & 2 deletions internal/model/tabs/jobhisttab/jobhisttabview.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"

"github.com/charmbracelet/lipgloss"
"github.com/pja237/slurmcommander-dev/internal/generic"
"github.com/pja237/slurmcommander-dev/internal/styles"
"github.com/CLIP-HPC/SlurmCommander/internal/generic"
"github.com/CLIP-HPC/SlurmCommander/internal/styles"
)

func (jh *JobHistTab) tabJobHist() string {
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/jobtab/jobtab.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/charmbracelet/bubbles/list"
"github.com/charmbracelet/bubbles/textinput"
"github.com/pja237/slurmcommander-dev/internal/generic"
"github.com/pja237/slurmcommander-dev/internal/stats"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/generic"
"github.com/CLIP-HPC/SlurmCommander/internal/stats"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
)

type JobTab struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/jobtab/jobtabcommands.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

tea "github.com/charmbracelet/bubbletea"
"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/config"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/config"
)

var (
Expand Down Expand Up @@ -39,7 +39,7 @@ func GetSqueue(t time.Time) tea.Msg {
if err != nil {
return command.ErrorMsg{
From: "GetSqueue",
ErrHelp: "squeue JSON failed to parse, note your slurm version and open an issue with us here: https://github.com/pja237/SlurmCommander-dev/issues/new/choose",
ErrHelp: "squeue JSON failed to parse, note your slurm version and open an issue with us here: https://github.com/CLIP-HPC/SlurmCommander/issues/new/choose",
OrigErr: err,
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/model/tabs/jobtab/jobtabkeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package jobtab

import (
"github.com/charmbracelet/bubbles/key"
"github.com/pja237/slurmcommander-dev/internal/keybindings"
"github.com/CLIP-HPC/SlurmCommander/internal/keybindings"
)

type Keys map[*key.Binding]bool
Expand Down
4 changes: 2 additions & 2 deletions internal/model/tabs/jobtab/jobtabmenu.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/charmbracelet/bubbles/list"
tea "github.com/charmbracelet/bubbletea"
"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/styles"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/styles"
)

type JobMenuOptions map[string]MenuOptions
Expand Down
6 changes: 3 additions & 3 deletions internal/model/tabs/jobtab/jobtabtable.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"time"

"github.com/pja237/slurmcommander-dev/internal/command"
"github.com/pja237/slurmcommander-dev/internal/slurm"
"github.com/pja237/slurmcommander-dev/internal/table"
"github.com/CLIP-HPC/SlurmCommander/internal/command"
"github.com/CLIP-HPC/SlurmCommander/internal/slurm"
"github.com/CLIP-HPC/SlurmCommander/internal/table"
)

var SqueueTabCols = []table.Column{
Expand Down
Loading

0 comments on commit ad4be14

Please sign in to comment.